diff options
| author | Stefan Monnier | 2011-01-14 12:18:41 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2011-01-14 12:18:41 -0500 |
| commit | 77ab81d0545e980c57c0a35510ade29a9e43b4cd (patch) | |
| tree | 258514dac7faab41642d8f319eb113c8a5f09690 /admin/ChangeLog | |
| parent | 8faba62c38f67693535c3471d867e66757b3b04e (diff) | |
| parent | fb724e553757e9d3344be443ab5f329afc9bf91c (diff) | |
| download | emacs-77ab81d0545e980c57c0a35510ade29a9e43b4cd.tar.gz emacs-77ab81d0545e980c57c0a35510ade29a9e43b4cd.zip | |
Merge from emacs-23
Diffstat (limited to 'admin/ChangeLog')
| -rw-r--r-- | admin/ChangeLog | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index e0059664aba..5edbbdac653 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,5 +1,10 @@ | |||
| 1 | 2011-01-14 Glenn Morris <rgm@gnu.org> | 1 | 2011-01-14 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * admin.el (set-copyright): Also handle \year in refcards/*.tex. | ||
| 4 | |||
| 5 | 2011-01-14 Eli Zaretskii <eliz@gnu.org> | ||
| 6 | 2011-01-14 Glenn Morris <rgm@gnu.org> | ||
| 7 | |||
| 3 | * bzrmerge.el: Require cl when compiling. | 8 | * bzrmerge.el: Require cl when compiling. |
| 4 | (bzrmerge-merges): Doc fix. | 9 | (bzrmerge-merges): Doc fix. |
| 5 | 10 | ||
| @@ -996,8 +1001,8 @@ | |||
| 996 | ;; coding: utf-8 | 1001 | ;; coding: utf-8 |
| 997 | ;; End: | 1002 | ;; End: |
| 998 | 1003 | ||
| 999 | Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, | 1004 | Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, |
| 1000 | 2008, 2009, 2010 Free Software Foundation, Inc. | 1005 | 2010, 2011 Free Software Foundation, Inc. |
| 1001 | 1006 | ||
| 1002 | This file is part of GNU Emacs. | 1007 | This file is part of GNU Emacs. |
| 1003 | 1008 | ||