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 /src/ChangeLog.9 | |
| parent | c089503bac34376e75ae6f1d2c289fc8c9f42b8f (diff) | |
| parent | d0ca1148fe2d1e72e86f0197731071f139c143e3 (diff) | |
| download | emacs-db4613576d3115aa320f0293d081ce98baa06acd.tar.gz emacs-db4613576d3115aa320f0293d081ce98baa06acd.zip | |
merge master
Diffstat (limited to 'src/ChangeLog.9')
| -rw-r--r-- | src/ChangeLog.9 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ChangeLog.9 b/src/ChangeLog.9 index 4b5afae0e6c..06ce3c1811c 100644 --- a/src/ChangeLog.9 +++ b/src/ChangeLog.9 | |||
| @@ -13294,7 +13294,7 @@ See ChangeLog.8 for earlier changes. | |||
| 13294 | ;; coding: utf-8 | 13294 | ;; coding: utf-8 |
| 13295 | ;; End: | 13295 | ;; End: |
| 13296 | 13296 | ||
| 13297 | Copyright (C) 2001-2014 Free Software Foundation, Inc. | 13297 | Copyright (C) 2001-2015 Free Software Foundation, Inc. |
| 13298 | 13298 | ||
| 13299 | This file is part of GNU Emacs. | 13299 | This file is part of GNU Emacs. |
| 13300 | 13300 | ||