diff options
| author | Glenn Morris | 2012-04-13 18:46:06 -0700 |
|---|---|---|
| committer | Glenn Morris | 2012-04-13 18:46:06 -0700 |
| commit | 35dc09a19c606f9e7a078df32d030451c7c90ba1 (patch) | |
| tree | 8df2ade99ad8620568094d61bba9dd4ac8856c43 /lib-src/ChangeLog | |
| parent | 327732d994c98849c765659aa2164a7482b6beab (diff) | |
| parent | ad3a2b411dc2b34f5d6fa434aee3ca56fa7a88e7 (diff) | |
| download | emacs-35dc09a19c606f9e7a078df32d030451c7c90ba1.tar.gz emacs-35dc09a19c606f9e7a078df32d030451c7c90ba1.zip | |
Merge from emacs-24, up to 2012-04-10T02:06:19Z!larsi@gnus.org
Diffstat (limited to 'lib-src/ChangeLog')
| -rw-r--r-- | lib-src/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index aad382de6d0..9ebe8a177ab 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-04-14 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * emacsclient.c (decode_options) [WINDOWSNT]: | ||
| 4 | Call ttyname instead of passing its address (typo in 2011-12-04T17:13:01Z!lekktu@gmail.com). | ||
| 5 | |||
| 1 | 2012-04-07 Eli Zaretskii <eliz@gnu.org> | 6 | 2012-04-07 Eli Zaretskii <eliz@gnu.org> |
| 2 | 7 | ||
| 3 | * makefile.w32-in (obj): Add xml.o. | 8 | * makefile.w32-in (obj): Add xml.o. |