diff options
| author | Paul Eggert | 2011-01-14 10:14:17 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-01-14 10:14:17 -0800 |
| commit | 8a1f4a98c1b8e3abaf1b46394a88d09531ce4c2d (patch) | |
| tree | 9aed5489fdfdcf75087bf3d8e50e4f5952c8566c /admin/ChangeLog | |
| parent | 3720fa2b1ac94b8ac9f193264bcf36990a5f43d2 (diff) | |
| parent | f80aa5bfa90dff5cd75d1f40e4ababa3c86af7fb (diff) | |
| download | emacs-8a1f4a98c1b8e3abaf1b46394a88d09531ce4c2d.tar.gz emacs-8a1f4a98c1b8e3abaf1b46394a88d09531ce4c2d.zip | |
Merge from mainline.
Diffstat (limited to 'admin/ChangeLog')
| -rw-r--r-- | admin/ChangeLog | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index e8b2d571ebd..5b714193ab1 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -11,6 +11,10 @@ | |||
| 11 | 11 | ||
| 12 | 2011-01-14 Glenn Morris <rgm@gnu.org> | 12 | 2011-01-14 Glenn Morris <rgm@gnu.org> |
| 13 | 13 | ||
| 14 | * admin.el (set-copyright): Also handle \year in refcards/*.tex. | ||
| 15 | |||
| 16 | 2011-01-14 Glenn Morris <rgm@gnu.org> | ||
| 17 | |||
| 14 | * bzrmerge.el: Require cl when compiling. | 18 | * bzrmerge.el: Require cl when compiling. |
| 15 | (bzrmerge-merges): Doc fix. | 19 | (bzrmerge-merges): Doc fix. |
| 16 | 20 | ||
| @@ -1007,8 +1011,8 @@ | |||
| 1007 | ;; coding: utf-8 | 1011 | ;; coding: utf-8 |
| 1008 | ;; End: | 1012 | ;; End: |
| 1009 | 1013 | ||
| 1010 | Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, | 1014 | Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, |
| 1011 | 2008, 2009, 2010 Free Software Foundation, Inc. | 1015 | 2010, 2011 Free Software Foundation, Inc. |
| 1012 | 1016 | ||
| 1013 | This file is part of GNU Emacs. | 1017 | This file is part of GNU Emacs. |
| 1014 | 1018 | ||