merge emacs-23

[gnu-emacs] / lib-src / ChangeLog

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index a68629d2393fcfe7c5289c8217b89ec3c86f7567..6b3584eb90fd47972c82d5db5c27aabc84d37486 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,12 @@
+2010-05-07  Chong Yidong  <cyd@stupidchicken.com>
+
+       * Version 23.2 released.
+
+2010-05-05  Christoph  <cschol2112@googlemail.com>  (tiny change)
+
+       * makefile.w32-in (OTHER_PLATFORM_SUPPORT): Use parenthesis
+       for macros for nmake compatibility.
+
 2010-04-03  Juanma Barranquero  <lekktu@gmail.com>
 
        Add stubs for Windows, required after CVE-2010-0825 change.