diff options
| author | Glenn Morris | 2011-01-14 09:42:40 -0800 |
|---|---|---|
| committer | Glenn Morris | 2011-01-14 09:42:40 -0800 |
| commit | 15a1cca8ecc4b5a7330f377e608a34552fc9fc0a (patch) | |
| tree | 5a221e5aae726c74e1b9d019571c8c6c91914f65 /admin/ChangeLog | |
| parent | 77ab81d0545e980c57c0a35510ade29a9e43b4cd (diff) | |
| download | emacs-15a1cca8ecc4b5a7330f377e608a34552fc9fc0a.tar.gz emacs-15a1cca8ecc4b5a7330f377e608a34552fc9fc0a.zip | |
ChangeLog merge fixes.
Diffstat (limited to 'admin/ChangeLog')
| -rw-r--r-- | admin/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 5edbbdac653..5807863a910 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | 2 | ||
| 3 | * admin.el (set-copyright): Also handle \year in refcards/*.tex. | 3 | * admin.el (set-copyright): Also handle \year in refcards/*.tex. |
| 4 | 4 | ||
| 5 | 2011-01-14 Eli Zaretskii <eliz@gnu.org> | ||
| 6 | 2011-01-14 Glenn Morris <rgm@gnu.org> | 5 | 2011-01-14 Glenn Morris <rgm@gnu.org> |
| 7 | 6 | ||
| 8 | * bzrmerge.el: Require cl when compiling. | 7 | * bzrmerge.el: Require cl when compiling. |