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/coding.h | |
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 'src/coding.h')
-rw-r--r-- | src/coding.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/coding.h b/src/coding.h index 2bf51c48883..ea0cdd5329e 100644 --- a/src/coding.h +++ b/src/coding.h @@ -1,5 +1,5 @@ /* Header for coding system handler. - Copyright (C) 2001-2015 Free Software Foundation, Inc. + Copyright (C) 2001-2016 Free Software Foundation, Inc. Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 National Institute of Advanced Industrial Science and Technology (AIST) |