Merge from emacs-24, up to 2012-04-10T02:06:19Z!larsi@gnus.org

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

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index aad382d..9ebe8a1 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+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.