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.4 | |
| 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.4')
| -rw-r--r-- | src/ChangeLog.4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ChangeLog.4 b/src/ChangeLog.4 index 54b37258c9f..b621d75d378 100644 --- a/src/ChangeLog.4 +++ b/src/ChangeLog.4 | |||
| @@ -6906,7 +6906,7 @@ See ChangeLog.3 for earlier changes. | |||
| 6906 | ;; coding: utf-8 | 6906 | ;; coding: utf-8 |
| 6907 | ;; End: | 6907 | ;; End: |
| 6908 | 6908 | ||
| 6909 | Copyright (C) 1993-1994, 2001-2014 Free Software Foundation, Inc. | 6909 | Copyright (C) 1993-1994, 2001-2015 Free Software Foundation, Inc. |
| 6910 | 6910 | ||
| 6911 | This file is part of GNU Emacs. | 6911 | This file is part of GNU Emacs. |
| 6912 | 6912 | ||