Mercurial > emacs
diff admin/ChangeLog @ 112228:417b1e4d63cd
Merge from emacs-23
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Fri, 14 Jan 2011 12:18:41 -0500 |
| parents | 1fd3710e6845 2ac9abce54fc |
| children | 41f5a96a1e35 |
line wrap: on
line diff
--- a/admin/ChangeLog Fri Jan 14 16:06:17 2011 +0100 +++ b/admin/ChangeLog Fri Jan 14 12:18:41 2011 -0500 @@ -1,3 +1,8 @@ +2011-01-14 Glenn Morris <rgm@gnu.org> + + * admin.el (set-copyright): Also handle \year in refcards/*.tex. + +2011-01-14 Eli Zaretskii <eliz@gnu.org> 2011-01-14 Glenn Morris <rgm@gnu.org> * bzrmerge.el: Require cl when compiling. @@ -996,8 +1001,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.