Merge from Gnus git master

[gnu-emacs] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index f8e98bdf3175420116eeb9c8f47d9ade0650f851..627fd22a1a68e9dae05c59425cff5dafb60a2722 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+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: