aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris2014-10-15 21:49:34 -0400
committerGlenn Morris2014-10-15 21:49:34 -0400
commit10471ae36190f741829cdc490f410b68226a1bb9 (patch)
tree9e3174e0a7b2b5865d4831079298ebc82d265c9c /src
parent8d7ee483cc812720621a1961e84beea5293dde38 (diff)
parentaffeda3b11005926d544a21e310f20d6a05f83de (diff)
downloademacs-10471ae36190f741829cdc490f410b68226a1bb9.tar.gz
emacs-10471ae36190f741829cdc490f410b68226a1bb9.zip
Merge from emacs-24; up to 2014-07-27T18:05:37Z!eliz@gnu.org
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog.122
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ChangeLog.12 b/src/ChangeLog.12
index c5ea7e7bad2..80d7460c734 100644
--- a/src/ChangeLog.12
+++ b/src/ChangeLog.12
@@ -1,6 +1,6 @@
12013-03-11 Glenn Morris <rgm@gnu.org> 12013-03-11 Glenn Morris <rgm@gnu.org>
2 2
3 * Version 24.3 released. 3 * Merge in all changes up to version 24.3 release.
4 4
52013-03-11 Paul Eggert <eggert@cs.ucla.edu> 52013-03-11 Paul Eggert <eggert@cs.ucla.edu>
6 6