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 /msdos/README | |
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 'msdos/README')
-rw-r--r-- | msdos/README | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/msdos/README b/msdos/README index 84093336383..4950da5ae52 100644 --- a/msdos/README +++ b/msdos/README @@ -1,4 +1,4 @@ -Copyright (C) 2001-2015 Free Software Foundation, Inc. +Copyright (C) 2001-2016 Free Software Foundation, Inc. See the end of the file for license conditions. @@ -10,7 +10,7 @@ The files emacs.ico and emacs.pif are for using the DJGPP version on Windows 3.X. Since these are binary files, their copyright notice is reproduced here: -# Copyright (C) 1993, 2002-2015 Free Software Foundation, Inc. +# Copyright (C) 1993, 2002-2016 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # |