diff options
| author | Kenichi Handa | 2012-01-21 20:36:42 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2012-01-21 20:36:42 +0900 |
| commit | 678fb7066698ebfe3aecba722294025ed26da01b (patch) | |
| tree | 951ac3055141d950974051d13c10e5d7c6a98e31 /src/ChangeLog.1 | |
| parent | 71784361eb381ec2b12bd8283724a7addec49079 (diff) | |
| parent | 959ad23fb9020a121c4520946835e9f0aeb9bcb2 (diff) | |
| download | emacs-678fb7066698ebfe3aecba722294025ed26da01b.tar.gz emacs-678fb7066698ebfe3aecba722294025ed26da01b.zip | |
merge trunk
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 7fef45f36da..5265d6fdf59 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-2011 Free Software Foundation, Inc. | 3524 | Copyright (C) 1985-1986, 2001-2012 Free Software Foundation, Inc. |
| 3525 | 3525 | ||
| 3526 | This file is part of GNU Emacs. | 3526 | This file is part of GNU Emacs. |
| 3527 | 3527 | ||