Merge changes from emacs-24; up to 2012-04-26T02:03:19Z!ueno@unixuser.org

[gnu-emacs] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index d392dd522b3020b8f7c292cf5f7eb03ac4a3aaa7..8baeeadc2d5e52090d50aa18a891d56096c0cfc1 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-17  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * nsterm.m (x_free_frame_resources): Move xfree so freed memory isn't
+       referenced (Bug#11583).
+
 2012-06-16  Aurelien Aptel  <aurelien.aptel@gmail.com>
 
        Implement wave-style variant of underlining.