Update copyright year to 2015

[gnu-emacs] / doc / man / ChangeLog

diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog
index 8723d9a9d6dbc6b9e899007bfcedd74a88421a4c..205e9b900ccc151db3dced9f79b6573f22f866de 100644 (file)
--- a/doc/man/ChangeLog
+++ b/doc/man/ChangeLog
@@ -1,3 +1,15 @@
+2014-12-14  Glenn Morris  <rgm@gnu.org>
+
+       * grep-changelog.1: Remove file.
+
+2014-11-10  Glenn Morris  <rgm@gnu.org>
+
+       * emacs.1.in: Rename from emacs.1.
+
+2014-10-20  Glenn Morris  <rgm@gnu.org>
+
+       * Merge in all changes up to 24.4 release.
+
 2014-09-29  Eli Zaretskii  <eliz@gnu.org>
 
        * emacs.1: Bump version to 25.0.50.
@@ -164,7 +176,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 2007-2014 Free Software Foundation, Inc.
+  Copyright (C) 2007-2015 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
@@ -180,4 +192,3 @@
 
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-