diff options
| author | K. Handa | 2016-01-14 21:55:43 +0900 |
|---|---|---|
| committer | K. Handa | 2016-01-14 21:55:43 +0900 |
| commit | 641a3472ef245157ebcb2114f2d608cb3cb401a7 (patch) | |
| tree | 85e524c8d12caca29588382205f536b2008edc55 /lisp/ChangeLog.7 | |
| parent | 9835757013569673854b692ccbb58bfb3c3ed1f7 (diff) | |
| parent | ee83b77f5ddede0fed518d0c23cf0ae38ce5b745 (diff) | |
| download | emacs-641a3472ef245157ebcb2114f2d608cb3cb401a7.tar.gz emacs-641a3472ef245157ebcb2114f2d608cb3cb401a7.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'lisp/ChangeLog.7')
| -rw-r--r-- | lisp/ChangeLog.7 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7 index 816f6142cf2..c072ce442a1 100644 --- a/lisp/ChangeLog.7 +++ b/lisp/ChangeLog.7 | |||
| @@ -23110,7 +23110,7 @@ See ChangeLog.6 for earlier changes. | |||
| 23110 | ;; coding: utf-8 | 23110 | ;; coding: utf-8 |
| 23111 | ;; End: | 23111 | ;; End: |
| 23112 | 23112 | ||
| 23113 | Copyright (C) 1997-1998, 2001-2015 Free Software Foundation, | 23113 | Copyright (C) 1997-1998, 2001-2016 Free Software Foundation, |
| 23114 | Inc. | 23114 | Inc. |
| 23115 | 23115 | ||
| 23116 | This file is part of GNU Emacs. | 23116 | This file is part of GNU Emacs. |