summaryrefslogtreecommitdiff
path: root/nextstep
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2014-10-20 20:59:41 +0100
committerGlenn Morris <rgm@gnu.org>2014-10-20 20:59:41 +0100
commit8a85c254de2528be0f3ff154fa24df65e6557c1a (patch)
treedfc704abfcaf816f3be832097805523536347a43 /nextstep
parent9d9bcb5020987f07dd2b9ab994f8826c07182829 (diff)
parentd20b72d9fa987ea9a511c6bed909c09929dc78f8 (diff)
Merge from emacs-24; up to 2014-07-28T06:28:15Z!dmantipov@yandex.ru
Diffstat (limited to 'nextstep')
-rw-r--r--nextstep/ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/nextstep/ChangeLog b/nextstep/ChangeLog
index e45326735f..110b21372d 100644
--- a/nextstep/ChangeLog
+++ b/nextstep/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-20 Glenn Morris <rgm@gnu.org>
+
+ * Merge in all changes up to 24.4 release.
+
2014-10-12 Paul Eggert <eggert@cs.ucla.edu>
* README: Mac OS X 10.6 or later now required.