aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog
diff options
context:
space:
mode:
authorGlenn Morris2013-07-20 12:20:33 -0700
committerGlenn Morris2013-07-20 12:20:33 -0700
commitf0398ec17f8a00d6c6d828c3d04522d94337d156 (patch)
tree478a4829ab66fd14da41090767b8f8a9d8d9122b /src/ChangeLog
parent1451928fffb2065a90e3decd0b9ba34d74dcc22b (diff)
parent862f1c9c3a172cd704e286964705b06aaf68b7fa (diff)
downloademacs-f0398ec17f8a00d6c6d828c3d04522d94337d156.tar.gz
emacs-f0398ec17f8a00d6c6d828c3d04522d94337d156.zip
Merge from emacs-24; up to 2012-12-31T11:35:13Z!rudalics@gmx.at
Diffstat (limited to 'src/ChangeLog')
-rw-r--r--src/ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 4c6bfaa2b1a..e6b594258dc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12013-07-20 Glenn Morris <rgm@gnu.org>
2
3 * image.c (Fimage_flush): Fix doc typo.
4
12013-07-20 Paul Eggert <eggert@cs.ucla.edu> 52013-07-20 Paul Eggert <eggert@cs.ucla.edu>
2 6
3 Fix array bounds violation when pty allocation fails. 7 Fix array bounds violation when pty allocation fails.