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 /src/ChangeLog.6 | |
| 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 'src/ChangeLog.6')
| -rw-r--r-- | src/ChangeLog.6 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ChangeLog.6 b/src/ChangeLog.6 index 5f73781c24e..ead1daf563a 100644 --- a/src/ChangeLog.6 +++ b/src/ChangeLog.6 | |||
| @@ -5358,7 +5358,7 @@ See ChangeLog.5 for earlier changes. | |||
| 5358 | ;; coding: utf-8 | 5358 | ;; coding: utf-8 |
| 5359 | ;; End: | 5359 | ;; End: |
| 5360 | 5360 | ||
| 5361 | Copyright (C) 1995-1996, 2001-2015 Free Software Foundation, Inc. | 5361 | Copyright (C) 1995-1996, 2001-2016 Free Software Foundation, Inc. |
| 5362 | 5362 | ||
| 5363 | This file is part of GNU Emacs. | 5363 | This file is part of GNU Emacs. |
| 5364 | 5364 | ||