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 /lib-src/ChangeLog.1 | |
| 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 'lib-src/ChangeLog.1')
| -rw-r--r-- | lib-src/ChangeLog.1 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib-src/ChangeLog.1 b/lib-src/ChangeLog.1 index 5b4154040da..030ef6fbb08 100644 --- a/lib-src/ChangeLog.1 +++ b/lib-src/ChangeLog.1 | |||
| @@ -8609,7 +8609,7 @@ | |||
| 8609 | ;; coding: utf-8 | 8609 | ;; coding: utf-8 |
| 8610 | ;; End: | 8610 | ;; End: |
| 8611 | 8611 | ||
| 8612 | Copyright (C) 1988-1999, 2001-2015 Free Software Foundation, Inc. | 8612 | Copyright (C) 1988-1999, 2001-2016 Free Software Foundation, Inc. |
| 8613 | 8613 | ||
| 8614 | This file is part of GNU Emacs. | 8614 | This file is part of GNU Emacs. |
| 8615 | 8615 | ||