Update copyright year to 2015

[gnu-emacs] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 73bac439d2e3e1b2d2e80840a5cecd3d7beb3502..343a58536ea8293ae6313c545ae6cbba4232758b 100644 (file)
--- 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.