aboutsummaryrefslogtreecommitdiffstats
path: root/admin/ChangeLog.1
diff options
context:
space:
mode:
authorK. Handa2016-01-14 21:55:43 +0900
committerK. Handa2016-01-14 21:55:43 +0900
commit641a3472ef245157ebcb2114f2d608cb3cb401a7 (patch)
tree85e524c8d12caca29588382205f536b2008edc55 /admin/ChangeLog.1
parent9835757013569673854b692ccbb58bfb3c3ed1f7 (diff)
parentee83b77f5ddede0fed518d0c23cf0ae38ce5b745 (diff)
downloademacs-641a3472ef245157ebcb2114f2d608cb3cb401a7.tar.gz
emacs-641a3472ef245157ebcb2114f2d608cb3cb401a7.zip
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'admin/ChangeLog.1')
-rw-r--r--admin/ChangeLog.12
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/ChangeLog.1 b/admin/ChangeLog.1
index d3fabd4c811..c7cae0cbaca 100644
--- a/admin/ChangeLog.1
+++ b/admin/ChangeLog.1
@@ -2577,7 +2577,7 @@
2577;; coding: utf-8 2577;; coding: utf-8
2578;; End: 2578;; End:
2579 2579
2580 Copyright (C) 2001-2015 Free Software Foundation, Inc. 2580 Copyright (C) 2001-2016 Free Software Foundation, Inc.
2581 2581
2582 This file is part of GNU Emacs. 2582 This file is part of GNU Emacs.
2583 2583