Merge from emacs-24; up to 2014-03-23T23:14:52Z!yamaoka@jpl.org

[gnu-emacs] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 04f5bed7ee29a5691f80b587a24bb3263f42adcd..d019c1e48938d7e01e7ccafbd2134b58f1b893e8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,27 @@
        2014-03-26 strftime: wrap macros in "do {...} while(0)"
        * lib/strftime.c: Update from gnulib.
 
+2014-03-26  Glenn Morris  <rgm@gnu.org>
+
+       * configure.ac (CLASH_DETECTION): Remove option.  Every platform
+       supports it, and the runtime option `create-lockfiles' replaces it.
+
+2014-03-23  Daniel Colascione  <dancol@dancol.org>
+
+       * configure.ac: (Bug#17069) Include GFILENOTIFY objects in glib check.
+
+2014-03-22  Glenn Morris  <rgm@gnu.org>
+
+       * make-dist: Do not distribute lib-src/testfile.
+
+2014-03-21  Eli Zaretskii  <eliz@gnu.org>
+
+       * configure.ac: Bump version to 24.4.50.
+
+2014-03-21  Glenn Morris  <rgm@gnu.org>
+
+       * Makefile.in (all): Depend on `info'.  (Bug#16626)
+
 2014-03-07  Paul Eggert  <eggert@cs.ucla.edu>
 
        Merge from gnulib, incorporating: