Merge from emacs-24; up to 2014-05-04T21:18:30Z!eggert@cs.ucla.edu

[gnu-emacs] / lib-src / ChangeLog

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 94ba8f4a9c21815c316d5c4e03c257ffa322a2de..b16f881c4deb28e3ef3ada41f16087065895c115 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Handle systems without WCONTINUED consistently.  (Bug#15110, 17339)
+       * emacsclient.c (WCONTINUED): Move to ../src/syswait.h.
+
 2014-04-30  Glenn Morris  <rgm@gnu.org>
 
        * Makefile.in ($(DESTDIR)${archlibdir}):