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 /src/ChangeLog.5 | |
| 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 'src/ChangeLog.5')
| -rw-r--r-- | src/ChangeLog.5 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ChangeLog.5 b/src/ChangeLog.5 index c6dfde7496b..6fefabc5cd0 100644 --- a/src/ChangeLog.5 +++ b/src/ChangeLog.5 | |||
| @@ -7148,7 +7148,7 @@ See ChangeLog.4 for earlier changes. | |||
| 7148 | ;; coding: utf-8 | 7148 | ;; coding: utf-8 |
| 7149 | ;; End: | 7149 | ;; End: |
| 7150 | 7150 | ||
| 7151 | Copyright (C) 1994-1995, 2001-2012 Free Software Foundation, Inc. | 7151 | Copyright (C) 1994-1995, 2001-2013 Free Software Foundation, Inc. |
| 7152 | 7152 | ||
| 7153 | This file is part of GNU Emacs. | 7153 | This file is part of GNU Emacs. |
| 7154 | 7154 | ||