Merge from emacs-24; up to 2012-04-20T05:47:55Z!eliz@gnu.org

[gnu-emacs] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index 8063c8d8166c56cf3ee40378975b3927f8619135..a4d7bb6491965a5fef7f578ed34e273f097fe9c6 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-05  Jim Meyering  <meyering@redhat.com>
+
+       * w32font.c (fill_in_logfont): NUL-terminate a string (Bug#11372).
+
 2012-05-04  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * data.c (PUT_ERROR): New macro.