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 /etc/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 'etc/ChangeLog')
| -rw-r--r-- | etc/ChangeLog | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog index 821d897c994..1c057848ead 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog | |||
| @@ -5956,7 +5956,7 @@ | |||
| 5956 | ;; coding: utf-8 | 5956 | ;; coding: utf-8 |
| 5957 | ;; End: | 5957 | ;; End: |
| 5958 | 5958 | ||
| 5959 | Copyright (C) 1993-1999, 2001-2012 Free Software Foundation, Inc. | 5959 | Copyright (C) 1993-1999, 2001-2013 Free Software Foundation, Inc. |
| 5960 | 5960 | ||
| 5961 | This file is part of GNU Emacs. | 5961 | This file is part of GNU Emacs. |
| 5962 | 5962 | ||