diff options
| author | K. Handa | 2015-01-07 22:51:41 +0900 |
|---|---|---|
| committer | K. Handa | 2015-01-07 22:51:41 +0900 |
| commit | 88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf (patch) | |
| tree | 18da116400703b67738bdbbd38cc4abf4c1e929f /src/ChangeLog.6 | |
| parent | 3f79d3131629f73da16ec121d2a0056f11b70e65 (diff) | |
| parent | 95295df44cc2b6e0e2442aeff96b0fe2ceac405c (diff) | |
| download | emacs-88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf.tar.gz emacs-88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf.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 19752bae1f4..5f73781c24e 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-2014 Free Software Foundation, Inc. | 5361 | Copyright (C) 1995-1996, 2001-2015 Free Software Foundation, Inc. |
| 5362 | 5362 | ||
| 5363 | This file is part of GNU Emacs. | 5363 | This file is part of GNU Emacs. |
| 5364 | 5364 | ||