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.1 | |
| 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.1')
| -rw-r--r-- | src/ChangeLog.1 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ChangeLog.1 b/src/ChangeLog.1 index 5265d6fdf59..0d926760017 100644 --- a/src/ChangeLog.1 +++ b/src/ChangeLog.1 | |||
| @@ -3521,7 +3521,7 @@ | |||
| 3521 | * minibuf.c: Don't allow entry to minibuffer | 3521 | * minibuf.c: Don't allow entry to minibuffer |
| 3522 | while minibuffer is selected. | 3522 | while minibuffer is selected. |
| 3523 | 3523 | ||
| 3524 | Copyright (C) 1985-1986, 2001-2012 Free Software Foundation, Inc. | 3524 | Copyright (C) 1985-1986, 2001-2013 Free Software Foundation, Inc. |
| 3525 | 3525 | ||
| 3526 | This file is part of GNU Emacs. | 3526 | This file is part of GNU Emacs. |
| 3527 | 3527 | ||