Mercurial > emacs
diff doc/man/ChangeLog @ 112228:417b1e4d63cd
Merge from emacs-23
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Fri, 14 Jan 2011 12:18:41 -0500 |
| parents | 40af77a50adc 376148b31b5e |
| children | ef719132ddfa |
line wrap: on
line diff
--- a/doc/man/ChangeLog Fri Jan 14 16:06:17 2011 +0100 +++ b/doc/man/ChangeLog Fri Jan 14 12:18:41 2011 -0500 @@ -110,7 +110,7 @@ ;; add-log-time-zone-rule: t ;; End: - Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. This file is part of GNU Emacs.