aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog.10
diff options
context:
space:
mode:
authorKenichi Handa2012-01-21 20:36:42 +0900
committerKenichi Handa2012-01-21 20:36:42 +0900
commit678fb7066698ebfe3aecba722294025ed26da01b (patch)
tree951ac3055141d950974051d13c10e5d7c6a98e31 /src/ChangeLog.10
parent71784361eb381ec2b12bd8283724a7addec49079 (diff)
parent959ad23fb9020a121c4520946835e9f0aeb9bcb2 (diff)
downloademacs-678fb7066698ebfe3aecba722294025ed26da01b.tar.gz
emacs-678fb7066698ebfe3aecba722294025ed26da01b.zip
merge trunk
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 53f7a016654..5baeb877939 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-2011 Free Software Foundation, Inc. 27915 Copyright (C) 2001-2012 Free Software Foundation, Inc.
27916 27916
27917 This file is part of GNU Emacs. 27917 This file is part of GNU Emacs.
27918 27918