Merge from emacs-23

[gnu-emacs] / admin / ChangeLog

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 1f2b4c58898f94f29c7b9930603e160aa407e3f6..cf96d99d3b1e9ac8a1cbdd41427f7e287b15e9e0 100644 (file)
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,11 @@
+2010-04-01  Eli Zaretskii  <eliz@gnu.org>
+
+       * CPP-DEFINES (__DJGPP__, __GO32__): Remove, no longer used.
+
+2010-03-10  Chong Yidong  <cyd@stupidchicken.com>
+
+       * Branch for 23.2.
+
 2010-03-10  Miles Bader  <miles@gnu.org>
 
        * quick-install-emacs: Use more portable shell syntax.