diff options
| author | Glenn Morris | 2011-01-13 18:44:25 -0800 |
|---|---|---|
| committer | Glenn Morris | 2011-01-13 18:44:25 -0800 |
| commit | 1851cac3e352fdc84b81a77cdd05b31d2149a04d (patch) | |
| tree | 255330e355e53890be2e23573a76247cb770c2f9 /admin/ChangeLog | |
| parent | fc55380c5c71e863846caeef1500cb46735ee28a (diff) | |
| download | emacs-1851cac3e352fdc84b81a77cdd05b31d2149a04d.tar.gz emacs-1851cac3e352fdc84b81a77cdd05b31d2149a04d.zip | |
* admin/bzrmerge.el: Require cl when compiling.
(bzrmerge-merges): Doc fix.
Diffstat (limited to 'admin/ChangeLog')
| -rw-r--r-- | admin/ChangeLog | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 07ed0179db0..e0059664aba 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-01-14 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * bzrmerge.el: Require cl when compiling. | ||
| 4 | (bzrmerge-merges): Doc fix. | ||
| 5 | |||
| 1 | 2011-01-07 Paul Eggert <eggert@cs.ucla.edu> | 6 | 2011-01-07 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 7 | ||
| 3 | * notes/copyright: There's only one install-sh, not two, so fix a | 8 | * notes/copyright: There's only one install-sh, not two, so fix a |
| @@ -989,7 +994,6 @@ | |||
| 989 | 994 | ||
| 990 | ;; Local Variables: | 995 | ;; Local Variables: |
| 991 | ;; coding: utf-8 | 996 | ;; coding: utf-8 |
| 992 | ;; add-log-time-zone-rule: t | ||
| 993 | ;; End: | 997 | ;; End: |
| 994 | 998 | ||
| 995 | Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, | 999 | Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, |
| @@ -1009,5 +1013,3 @@ | |||
| 1009 | 1013 | ||
| 1010 | You should have received a copy of the GNU General Public License | 1014 | You should have received a copy of the GNU General Public License |
| 1011 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. | 1015 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
| 1012 | |||
| 1013 | ;;; arch-tag: 97728c77-77c0-4156-b669-0e8c07d94e5a | ||