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.11 | |
| 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.11')
| -rw-r--r-- | src/ChangeLog.11 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ChangeLog.11 b/src/ChangeLog.11 index 1f444b9292c..1195a8f9592 100644 --- a/src/ChangeLog.11 +++ b/src/ChangeLog.11 | |||
| @@ -31383,7 +31383,7 @@ See ChangeLog.10 for earlier changes. | |||
| 31383 | ;; coding: utf-8 | 31383 | ;; coding: utf-8 |
| 31384 | ;; End: | 31384 | ;; End: |
| 31385 | 31385 | ||
| 31386 | Copyright (C) 2007-2012 Free Software Foundation, Inc. | 31386 | Copyright (C) 2007-2013 Free Software Foundation, Inc. |
| 31387 | 31387 | ||
| 31388 | This file is part of GNU Emacs. | 31388 | This file is part of GNU Emacs. |
| 31389 | 31389 | ||