summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2015-01-01 14:26:41 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2015-01-01 14:26:41 -0800
commit7e09ef09a479731d01b1ca46e94ddadd73ac98e3 (patch)
tree402540bff550161e65a04d78785c3b2c543f5853 /ChangeLog
parent647c7c9a726c4f6d29cc8f932e434555f1d0aed8 (diff)
downloademacs-7e09ef09a479731d01b1ca46e94ddadd73ac98e3.tar.gz
Update copyright year to 2015
Run admin/update-copyright.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 73bac439d2e..343a58536ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2015-01-01 Paul Eggert <eggert@cs.ucla.edu>
+ Update copyright year to 2015
+ Run admin/update-copyright.
+
Merge from gnulib, incorporating:
2015-01-01 version-etc: new year
@@ -14546,7 +14549,7 @@
;; coding: utf-8
;; End:
- Copyright (C) 1993-1999, 2001-2014 Free Software Foundation, Inc.
+ Copyright (C) 1993-1999, 2001-2015 Free Software Foundation, Inc.
This file is part of GNU Emacs.