Merge from origin/emacs-26
commitec6ef1e38b2618b3c5bdd28e2d4dac0afa2b3033
authorGlenn Morris <rgm@gnu.org>
Sat, 20 Jan 2018 16:23:30 +0000 (20 08:23 -0800)
committerGlenn Morris <rgm@gnu.org>
Sat, 20 Jan 2018 16:23:30 +0000 (20 08:23 -0800)
tree0832cbdf9699c35d27f61696edacfaad70c3d7d3
parent530bb2dc68bbd8be8a90759992095cc2edc4efcf
parent297dc41e2c6e84efac092e2d6f69824cb3b6d98d
Merge from origin/emacs-26

297dc41 * configure.ac (emacs_config_features): Add threads.

Conflicts:
configure.ac
configure.ac