aboutsummaryrefslogtreecommitdiffstats
path: root/admin/ChangeLog
diff options
context:
space:
mode:
authorGlenn Morris2014-05-11 23:59:30 -0700
committerGlenn Morris2014-05-11 23:59:30 -0700
commitbbbabffe06d4c763534d5be92844c48a3f8746e2 (patch)
treea6fffb13638948223f3142e5209cbce57282fbbd /admin/ChangeLog
parentffd6d9c4d321e93e301f9cafd1fe054389898978 (diff)
parent96b894717caa773aa6d98ff57385f1c7537e8972 (diff)
downloademacs-bbbabffe06d4c763534d5be92844c48a3f8746e2.tar.gz
emacs-bbbabffe06d4c763534d5be92844c48a3f8746e2.zip
Merge from emacs-24; up to 2014-05-12T06:15:47Z!rgm@gnu.org
Diffstat (limited to 'admin/ChangeLog')
-rw-r--r--admin/ChangeLog8
1 files changed, 8 insertions, 0 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 7af23b779ef..87da4f7e26b 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,11 @@
12014-05-12 Glenn Morris <rgm@gnu.org>
2
3 * find-gc.el: Move here from ../lisp/emacs-lisp.
4
5 * admin.el (set-version-in-file): Don't set identical version.
6 (set-version): Provide default version number.
7 (set-version, set-copyright): Give start/end messages.
8
12014-04-18 Paul Eggert <eggert@cs.ucla.edu> 92014-04-18 Paul Eggert <eggert@cs.ucla.edu>
2 10
3 * notes/bzr: Update instructions for merging from gnulib. 11 * notes/bzr: Update instructions for merging from gnulib.