aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/ChangeLog.2
diff options
context:
space:
mode:
authorK. Handa2016-01-14 21:55:43 +0900
committerK. Handa2016-01-14 21:55:43 +0900
commit641a3472ef245157ebcb2114f2d608cb3cb401a7 (patch)
tree85e524c8d12caca29588382205f536b2008edc55 /lisp/ChangeLog.2
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 'lisp/ChangeLog.2')
-rw-r--r--lisp/ChangeLog.22
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/ChangeLog.2 b/lisp/ChangeLog.2
index e91122aea60..3d8bd7a91b6 100644
--- a/lisp/ChangeLog.2
+++ b/lisp/ChangeLog.2
@@ -3992,7 +3992,7 @@
3992 3992
3993See ChangeLog.1 for earlier changes. 3993See ChangeLog.1 for earlier changes.
3994 3994
3995 Copyright (C) 1986-1988, 2001-2015 Free Software Foundation, Inc. 3995 Copyright (C) 1986-1988, 2001-2016 Free Software Foundation, Inc.
3996 3996
3997 This file is part of GNU Emacs. 3997 This file is part of GNU Emacs.
3998 3998