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.2 | |
| 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.2')
| -rw-r--r-- | src/ChangeLog.2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ChangeLog.2 b/src/ChangeLog.2 index f8fc9b1c813..f62f3bb5835 100644 --- a/src/ChangeLog.2 +++ b/src/ChangeLog.2 | |||
| @@ -4771,7 +4771,7 @@ | |||
| 4771 | 4771 | ||
| 4772 | See ChangeLog.1 for earlier changes. | 4772 | See ChangeLog.1 for earlier changes. |
| 4773 | 4773 | ||
| 4774 | Copyright (C) 1986-1988, 2001-2014 Free Software Foundation, Inc. | 4774 | Copyright (C) 1986-1988, 2001-2015 Free Software Foundation, Inc. |
| 4775 | 4775 | ||
| 4776 | This file is part of GNU Emacs. | 4776 | This file is part of GNU Emacs. |
| 4777 | 4777 | ||