diff options
| author | K. Handa | 2016-01-14 21:55:43 +0900 |
|---|---|---|
| committer | K. Handa | 2016-01-14 21:55:43 +0900 |
| commit | 641a3472ef245157ebcb2114f2d608cb3cb401a7 (patch) | |
| tree | 85e524c8d12caca29588382205f536b2008edc55 /src/ChangeLog.1 | |
| parent | 9835757013569673854b692ccbb58bfb3c3ed1f7 (diff) | |
| parent | ee83b77f5ddede0fed518d0c23cf0ae38ce5b745 (diff) | |
| download | emacs-641a3472ef245157ebcb2114f2d608cb3cb401a7.tar.gz emacs-641a3472ef245157ebcb2114f2d608cb3cb401a7.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
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 4b6ed3a987c..19cc3a29979 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-2015 Free Software Foundation, Inc. | 3524 | Copyright (C) 1985-1986, 2001-2016 Free Software Foundation, Inc. |
| 3525 | 3525 | ||
| 3526 | This file is part of GNU Emacs. | 3526 | This file is part of GNU Emacs. |
| 3527 | 3527 | ||