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 /lisp/ChangeLog.12 | |
| 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 'lisp/ChangeLog.12')
| -rw-r--r-- | lisp/ChangeLog.12 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12 index 968658cb69c..8ca2ff91bab 100644 --- a/lisp/ChangeLog.12 +++ b/lisp/ChangeLog.12 @@ -33334,7 +33334,7 @@ See ChangeLog.11 for earlier changes. ;; add-log-time-zone-rule: t ;; End: - Copyright (C) 2005-2015 Free Software Foundation, Inc. + Copyright (C) 2005-2016 Free Software Foundation, Inc. This file is part of GNU Emacs. |