diff options
| author | Paul Eggert | 2013-01-02 08:13:04 -0800 |
|---|---|---|
| committer | Paul Eggert | 2013-01-02 08:13:04 -0800 |
| commit | 0877d0dc24ee792b9b14592869ea1aa0934aee58 (patch) | |
| tree | 08e9265a1dd95974dc72622a9bef194682c0c716 /lib-src/ChangeLog | |
| parent | aca3d51dfa45794fa68a2ffb6269e34fcee2ec6c (diff) | |
| parent | d8fb8cce84b923a3289b69549e30958710ac3ebb (diff) | |
| download | emacs-0877d0dc24ee792b9b14592869ea1aa0934aee58.tar.gz emacs-0877d0dc24ee792b9b14592869ea1aa0934aee58.zip | |
Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca
Diffstat (limited to 'lib-src/ChangeLog')
| -rw-r--r-- | lib-src/ChangeLog | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 33eac5b9b67..92b970eb778 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -8483,7 +8483,7 @@ | |||
| 8483 | ;; coding: utf-8 | 8483 | ;; coding: utf-8 |
| 8484 | ;; End: | 8484 | ;; End: |
| 8485 | 8485 | ||
| 8486 | Copyright (C) 1988-1999, 2001-2012 Free Software Foundation, Inc. | 8486 | Copyright (C) 1988-1999, 2001-2013 Free Software Foundation, Inc. |
| 8487 | 8487 | ||
| 8488 | This file is part of GNU Emacs. | 8488 | This file is part of GNU Emacs. |
| 8489 | 8489 | ||