Merge from emacs-24; up to 2012-04-24T21:47:24Z!michael.albinus@gmx.de

[gnu-emacs] / lib-src / ChangeLog

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index d95137852e0d9a33bf54396bea336a32d49b912d..ff631d09fcdcbd30a2cba063d095d030b7834f55 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-31  Eli Zaretskii  <eliz@gnu.org>
+
+       * makefile.w32-in ($(BLD)/emacsclientw.exe): Use $(MWINDOWS)
+       instead of a literal -mwindows, which is not supported by MSVC.
+       (Bug#11405)
+
 2012-05-30  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * make-docfile.c: Improve comment style.