summaryrefslogtreecommitdiff
path: root/doc/misc/Makefile.in
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2016-01-11 22:48:07 -0800
committerJohn Wiegley <johnw@newartisans.com>2016-01-11 22:48:07 -0800
commit1dd4f26ab6c1f14628d9fcf03b0cca7e54d52302 (patch)
treefc34bd815956a80c35f1e9a0f836a5378bf4b1ed /doc/misc/Makefile.in
parentc043d9731b499a241830d705e9055c9e42ccf28c (diff)
parentef33bc7fcf7b2e9fc41706ebce3bfbc814b0e832 (diff)
downloademacs-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/Makefile.in')
-rw-r--r--doc/misc/Makefile.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index aa35002e85e..4dffeafb1d2 100644
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -1,6 +1,6 @@
### @configure_input@
-# Copyright (C) 1994, 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1996-2016 Free Software Foundation, Inc.
# This file is part of GNU Emacs.