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 /src/ChangeLog.8 | |
parent | c043d9731b499a241830d705e9055c9e42ccf28c (diff) | |
parent | ef33bc7fcf7b2e9fc41706ebce3bfbc814b0e832 (diff) |
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 'src/ChangeLog.8')
-rw-r--r-- | src/ChangeLog.8 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ChangeLog.8 b/src/ChangeLog.8 index aa331eafc0..3d24b2db12 100644 --- a/src/ChangeLog.8 +++ b/src/ChangeLog.8 @@ -13979,7 +13979,7 @@ See ChangeLog.7 for earlier changes. - Copyright (C) 1999, 2001-2015 Free Software Foundation, Inc. + Copyright (C) 1999, 2001-2016 Free Software Foundation, Inc. This file is part of GNU Emacs. |