aboutsummaryrefslogtreecommitdiffstats
path: root/admin/ChangeLog
diff options
context:
space:
mode:
authorGlenn Morris2014-06-25 23:55:15 -0700
committerGlenn Morris2014-06-25 23:55:15 -0700
commit9ac6d28ab8c29547d9f9365dc8f7cea13c32ef7a (patch)
tree026dc1d5a858b27086c4f9d8e0f4a60b7907eb80 /admin/ChangeLog
parenta0e2175a9055f2ea8ae03744d495e5179885029d (diff)
parent436550da1bf8d2cdd92a60f6ce84f131a8045062 (diff)
downloademacs-9ac6d28ab8c29547d9f9365dc8f7cea13c32ef7a.tar.gz
emacs-9ac6d28ab8c29547d9f9365dc8f7cea13c32ef7a.zip
Merge from emacs-24; up to 2014-06-11T19:33:14Z!rgm@gnu.org
Diffstat (limited to 'admin/ChangeLog')
-rw-r--r--admin/ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 4aacf009925..d96368c4f9a 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,8 @@
12014-06-26 Eli Zaretskii <eliz@gnu.org>
2
3 * notes/unicode: Some notes about what to do when a new Unicode
4 version is imported.
5
12014-06-26 Glenn Morris <rgm@gnu.org> 62014-06-26 Glenn Morris <rgm@gnu.org>
2 7
3 * authors.el: Move here from ../lisp/emacs-lisp. 8 * authors.el: Move here from ../lisp/emacs-lisp.