diff options
| author | John Wiegley <johnw@newartisans.com> | 2016-01-11 22:48:07 -0800 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2016-01-11 22:48:07 -0800 |
| commit | 1dd4f26ab6c1f14628d9fcf03b0cca7e54d52302 (patch) | |
| tree | fc34bd815956a80c35f1e9a0f836a5378bf4b1ed /ChangeLog.2 | |
| parent | c043d9731b499a241830d705e9055c9e42ccf28c (diff) | |
| parent | ef33bc7fcf7b2e9fc41706ebce3bfbc814b0e832 (diff) | |
| download | emacs-1dd4f26ab6c1f14628d9fcf03b0cca7e54d52302.tar.gz | |
Merge from origin/emacs-25
ef33bc7 Spelling and grammar fixes
9c3dbab Fix copyright years by hand
0e96320 Update copyright year to 2016
Diffstat (limited to 'ChangeLog.2')
| -rw-r--r-- | ChangeLog.2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ChangeLog.2 b/ChangeLog.2 index 258b44224f7..54e0f20adb2 100644 --- a/ChangeLog.2 +++ b/ChangeLog.2 @@ -25343,7 +25343,7 @@ See ChangeLog.1 for earlier changes. ;; coding: utf-8 ;; End: - Copyright (C) 2015 Free Software Foundation, Inc. + Copyright (C) 2015-2016 Free Software Foundation, Inc. This file is part of GNU Emacs. |