aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog.3
diff options
context:
space:
mode:
authorK. Handa2015-01-07 22:51:41 +0900
committerK. Handa2015-01-07 22:51:41 +0900
commit88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf (patch)
tree18da116400703b67738bdbbd38cc4abf4c1e929f /src/ChangeLog.3
parent3f79d3131629f73da16ec121d2a0056f11b70e65 (diff)
parent95295df44cc2b6e0e2442aeff96b0fe2ceac405c (diff)
downloademacs-88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf.tar.gz
emacs-88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf.zip
Merge branch master of git.sv.gnu.org:/srv/git/emacs.
Diffstat (limited to 'src/ChangeLog.3')
-rw-r--r--src/ChangeLog.32
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ChangeLog.3 b/src/ChangeLog.3
index 0a04a134cc3..d7c0a2f2b3c 100644
--- a/src/ChangeLog.3
+++ b/src/ChangeLog.3
@@ -16503,7 +16503,7 @@ See ChangeLog.2 for earlier changes.
16503;; coding: utf-8 16503;; coding: utf-8
16504;; End: 16504;; End:
16505 16505
16506 Copyright (C) 1993, 2001-2014 Free Software Foundation, Inc. 16506 Copyright (C) 1993, 2001-2015 Free Software Foundation, Inc.
16507 16507
16508 This file is part of GNU Emacs. 16508 This file is part of GNU Emacs.
16509 16509