aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog.10
diff options
context:
space:
mode:
authorK. Handa2016-01-14 21:55:43 +0900
committerK. Handa2016-01-14 21:55:43 +0900
commit641a3472ef245157ebcb2114f2d608cb3cb401a7 (patch)
tree85e524c8d12caca29588382205f536b2008edc55 /src/ChangeLog.10
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 'src/ChangeLog.10')
-rw-r--r--src/ChangeLog.102
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ChangeLog.10 b/src/ChangeLog.10
index 6eba7f06b9c..340f15e4d63 100644
--- a/src/ChangeLog.10
+++ b/src/ChangeLog.10
@@ -27912,7 +27912,7 @@ See ChangeLog.9 for earlier changes.
27912;; add-log-time-zone-rule: t 27912;; add-log-time-zone-rule: t
27913;; End: 27913;; End:
27914 27914
27915 Copyright (C) 2001-2015 Free Software Foundation, Inc. 27915 Copyright (C) 2001-2016 Free Software Foundation, Inc.
27916 27916
27917 This file is part of GNU Emacs. 27917 This file is part of GNU Emacs.
27918 27918