summaryrefslogtreecommitdiff
path: root/admin
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2014-05-25 19:28:09 -0700
committerGlenn Morris <rgm@gnu.org>2014-05-25 19:28:09 -0700
commit015936fba1bcaa51b7886a73144d4c088200c0aa (patch)
treec9628339352c1a97e574df28966e977143c43e41 /admin
parent5e26d9849a79bf78fda821979fc937f7e5e6df52 (diff)
parente8f2cc26e712f42f6391fa52cd67c3e791096f1e (diff)
downloademacs-015936fba1bcaa51b7886a73144d4c088200c0aa.tar.gz
Merge from emacs-24; up to 2014-05-26T10:21:18Z!rgm@gnu.org
Diffstat (limited to 'admin')
-rw-r--r--admin/ChangeLog5
1 files changed, 2 insertions, 3 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 35ad1744410..79adb4f543d 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,7 +1,6 @@
-2014-05-25 Jan Djärv <jan.h.d@swipnet.se>
+2014-05-25 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
- * mac/uvs.el: New file from Mac port. src/macuvs.h is generated
- by it.
+ * mac/uvs.el: New file from Mac port. Generates src/macuvs.h.
2014-05-17 Paul Eggert <eggert@cs.ucla.edu>