Merge from mainline.

[gnu-emacs] / admin / ChangeLog

diff --git a/admin/ChangeLog b/admin/ChangeLog
index e8b2d571ebd9f5d224c17c7316443dcbbfc34cb8..5b714193ab15b3b6abadf2daeb1b6f2dd788d95e 100644 (file)
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -9,6 +9,10 @@
        subsumed by m4/*.m4 rule).  config.guess, config.sub, and
        doc/man/texinfo.tex are now copied in from gnulib.
 
+2011-01-14  Glenn Morris  <rgm@gnu.org>
+
+       * admin.el (set-copyright): Also handle \year in refcards/*.tex.
+
 2011-01-14  Glenn Morris  <rgm@gnu.org>
 
        * bzrmerge.el: Require cl when compiling.
@@ -1007,8 +1011,8 @@
 ;; coding: utf-8
 ;; End:
 
-    Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-       2008, 2009, 2010  Free Software Foundation, Inc.
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+    2010, 2011  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.