diff options
| author | Eli Zaretskii | 2013-03-28 20:13:59 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2013-03-28 20:13:59 +0200 |
| commit | d76bf86f438d4f5f9fe493ab76f02ffc78f3ae2e (patch) | |
| tree | 04fa8bc7bd2058a316a7ee30f8741d25bfd0b060 /src/ChangeLog.8 | |
| parent | 2ef26ceb192c7683754cf0b4aa3087f501254332 (diff) | |
| parent | e74aeda863cd6896e06e92586f87b45d63d67d15 (diff) | |
| download | emacs-d76bf86f438d4f5f9fe493ab76f02ffc78f3ae2e.tar.gz emacs-d76bf86f438d4f5f9fe493ab76f02ffc78f3ae2e.zip | |
Merge from trunk and resolve conflicts.
Diffstat (limited to 'src/ChangeLog.8')
| -rw-r--r-- | src/ChangeLog.8 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ChangeLog.8 b/src/ChangeLog.8 index e68966b16a2..e89e6b006b7 100644 --- a/src/ChangeLog.8 +++ b/src/ChangeLog.8 | |||
| @@ -13979,7 +13979,7 @@ | |||
| 13979 | 13979 | ||
| 13980 | See ChangeLog.7 for earlier changes. | 13980 | See ChangeLog.7 for earlier changes. |
| 13981 | 13981 | ||
| 13982 | Copyright (C) 1999, 2001-2012 Free Software Foundation, Inc. | 13982 | Copyright (C) 1999, 2001-2013 Free Software Foundation, Inc. |
| 13983 | 13983 | ||
| 13984 | This file is part of GNU Emacs. | 13984 | This file is part of GNU Emacs. |
| 13985 | 13985 | ||