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 /doc/misc/ChangeLog.1 | |
| 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 'doc/misc/ChangeLog.1')
| -rw-r--r-- | doc/misc/ChangeLog.1 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/misc/ChangeLog.1 b/doc/misc/ChangeLog.1 index 2fd0d2c3eba..eb16d4ac565 100644 --- a/doc/misc/ChangeLog.1 +++ b/doc/misc/ChangeLog.1 @@ -12116,7 +12116,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1993-1999, 2001-2015 Free Software Foundation, Inc. + Copyright (C) 1993-1999, 2001-2016 Free Software Foundation, Inc. This file is part of GNU Emacs. |