aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog.11
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.11
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.11')
-rw-r--r--src/ChangeLog.112
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ChangeLog.11 b/src/ChangeLog.11
index 100b0cbe710..351f9785765 100644
--- a/src/ChangeLog.11
+++ b/src/ChangeLog.11
@@ -31385,7 +31385,7 @@ See ChangeLog.10 for earlier changes.
31385;; coding: utf-8 31385;; coding: utf-8
31386;; End: 31386;; End:
31387 31387
31388 Copyright (C) 2007-2014 Free Software Foundation, Inc. 31388 Copyright (C) 2007-2015 Free Software Foundation, Inc.
31389 31389
31390 This file is part of GNU Emacs. 31390 This file is part of GNU Emacs.
31391 31391