Merge from emacs-24

[gnu-emacs] / admin / ChangeLog

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 1aa086cd52e95b65aaa42b1bc7f5ad00fc93c354..0d059714788a24732c6ea8381392ac1d7e22af25 100644 (file)
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,10 @@
+2012-07-17  Eli Zaretskii  <eliz@gnu.org>
+
+       * CPP-DEFINES: Remove FILE_SYSTEM_CASE.
+
+2012-07-17  Chong Yidong  <cyd@gnu.org>
+
+       * Version 24.1 released.
 2012-07-11  Paul Eggert  <eggert@cs.ucla.edu>
 
        Assume mkdir, perror, rename, rmdir, strerror.