diff options
| author | Paul Eggert | 2017-01-01 01:10:47 -0800 |
|---|---|---|
| committer | Paul Eggert | 2017-01-01 01:10:47 -0800 |
| commit | bcf244ef9be0fe61f4b9a48d3412b2c8a9f1edb9 (patch) | |
| tree | dc5dde303bce1fbe4f04300c3691cc1ee5874f43 /src/ChangeLog.4 | |
| parent | 772ca5db3eccdc0439d7bd18f98b7fdd38eb6397 (diff) | |
| parent | 2e2a8068031b79a6cc5502b8d4c9d849ebb1dae0 (diff) | |
| download | emacs-bcf244ef9be0fe61f4b9a48d3412b2c8a9f1edb9.tar.gz emacs-bcf244ef9be0fe61f4b9a48d3412b2c8a9f1edb9.zip | |
Merge from origin/emacs-25
2e2a806 Fix copyright years by hand
5badc81 Update copyright year to 2017
Diffstat (limited to 'src/ChangeLog.4')
| -rw-r--r-- | src/ChangeLog.4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ChangeLog.4 b/src/ChangeLog.4 index 4970cbdfe7d..bb13c9a5f68 100644 --- a/src/ChangeLog.4 +++ b/src/ChangeLog.4 | |||
| @@ -6906,7 +6906,7 @@ See ChangeLog.3 for earlier changes. | |||
| 6906 | ;; coding: utf-8 | 6906 | ;; coding: utf-8 |
| 6907 | ;; End: | 6907 | ;; End: |
| 6908 | 6908 | ||
| 6909 | Copyright (C) 1993-1994, 2001-2016 Free Software Foundation, Inc. | 6909 | Copyright (C) 1993-1994, 2001-2017 Free Software Foundation, Inc. |
| 6910 | 6910 | ||
| 6911 | This file is part of GNU Emacs. | 6911 | This file is part of GNU Emacs. |
| 6912 | 6912 | ||