diff options
| author | jave | 2015-01-02 16:30:55 +0100 |
|---|---|---|
| committer | jave | 2015-01-02 16:30:55 +0100 |
| commit | db4613576d3115aa320f0293d081ce98baa06acd (patch) | |
| tree | 829968643b451bd3f64c791e4d3a6c928010e14c /lib-src/ChangeLog | |
| parent | c089503bac34376e75ae6f1d2c289fc8c9f42b8f (diff) | |
| parent | d0ca1148fe2d1e72e86f0197731071f139c143e3 (diff) | |
| download | emacs-db4613576d3115aa320f0293d081ce98baa06acd.tar.gz emacs-db4613576d3115aa320f0293d081ce98baa06acd.zip | |
merge master
Diffstat (limited to 'lib-src/ChangeLog')
| -rw-r--r-- | lib-src/ChangeLog | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 07a72ecaf0d..eb2b1f3a94c 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -8417,7 +8417,7 @@ | |||
| 8417 | ;; coding: utf-8 | 8417 | ;; coding: utf-8 |
| 8418 | ;; End: | 8418 | ;; End: |
| 8419 | 8419 | ||
| 8420 | Copyright (C) 1988-1999, 2001-2014 Free Software Foundation, Inc. | 8420 | Copyright (C) 1988-1999, 2001-2015 Free Software Foundation, Inc. |
| 8421 | 8421 | ||
| 8422 | This file is part of GNU Emacs. | 8422 | This file is part of GNU Emacs. |
| 8423 | 8423 | ||