Merge from trunk.

[bpt/emacs.git] / lib-src / ChangeLog

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index a9ad2a9..6c2d23b 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,10 +1,14 @@
-2012-04-09  Paul Eggert  <eggert@cs.ucla.edu>
+2012-04-14  Paul Eggert  <eggert@cs.ucla.edu>
 
        configure: new option --enable-gcc-warnings (Bug#11207)
        * Makefile.in (C_WARNINGS_SWITCH): Remove.
        (WARN_CFLAGS, WERROR_CFLAGS): New macros.
        (BASE_CFLAGS): Use new macros rather than old.
 
+2012-04-14  Juanma Barranquero  <lekktu@gmail.com>
+       * emacsclient.c (decode_options) [WINDOWSNT]:
+       Call ttyname instead of passing its address (typo in 2011-12-04T17:13:01Z!lekktu@gmail.com).
+
 2012-04-07  Eli Zaretskii  <eliz@gnu.org>
 
        * makefile.w32-in (obj): Add xml.o.