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.7 | |
| 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.7')
| -rw-r--r-- | src/ChangeLog.7 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ChangeLog.7 b/src/ChangeLog.7 index c43ab88fff6..f603d53bb6a 100644 --- a/src/ChangeLog.7 +++ b/src/ChangeLog.7 | |||
| @@ -11091,7 +11091,7 @@ See ChangeLog.6 for earlier changes. | |||
| 11091 | ;; coding: utf-8 | 11091 | ;; coding: utf-8 |
| 11092 | ;; End: | 11092 | ;; End: |
| 11093 | 11093 | ||
| 11094 | Copyright (C) 1997-1998, 2001-2014 Free Software Foundation, Inc. | 11094 | Copyright (C) 1997-1998, 2001-2015 Free Software Foundation, Inc. |
| 11095 | 11095 | ||
| 11096 | This file is part of GNU Emacs. | 11096 | This file is part of GNU Emacs. |
| 11097 | 11097 | ||