aboutsummaryrefslogtreecommitdiffstats
path: root/doc/misc/ediff.texi
diff options
context:
space:
mode:
authorPaul Eggert2015-01-01 14:27:34 -0800
committerPaul Eggert2015-01-01 14:27:34 -0800
commit52a4e87c630ea397408efe4f8486be55e1199905 (patch)
tree0b42ee5a37ae668b3c57bd3ec66b295e3980b601 /doc/misc/ediff.texi
parent7e09ef09a479731d01b1ca46e94ddadd73ac98e3 (diff)
downloademacs-52a4e87c630ea397408efe4f8486be55e1199905.tar.gz
emacs-52a4e87c630ea397408efe4f8486be55e1199905.zip
Fix copyright years by hand
These are dates that admin/update-copyright did not update, or updated incorrectly. Also, back out the copyright-date change to doc/misc/texinfo.tex, as upstream hasn't updated that date yet.
Diffstat (limited to 'doc/misc/ediff.texi')
-rw-r--r--doc/misc/ediff.texi2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/misc/ediff.texi b/doc/misc/ediff.texi
index 4e1806de94d..36c6ae24b12 100644
--- a/doc/misc/ediff.texi
+++ b/doc/misc/ediff.texi
@@ -26,7 +26,7 @@
26This file documents Ediff, a comprehensive visual interface to Unix diff 26This file documents Ediff, a comprehensive visual interface to Unix diff
27and patch utilities. 27and patch utilities.
28 28
29Copyright @copyright{} 1995--2014 Free Software Foundation, Inc. 29Copyright @copyright{} 1995--2015 Free Software Foundation, Inc.
30 30
31@quotation 31@quotation
32Permission is granted to copy, distribute and/or modify this document 32Permission is granted to copy, distribute and/or modify this document