Mercurial > emacs
diff admin/ChangeLog @ 112229:41f5a96a1e35
ChangeLog merge fixes.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Fri, 14 Jan 2011 09:42:40 -0800 |
parents | 417b1e4d63cd |
children | 8f641c1fc9cc 17e0028efc29 |
line wrap: on
line diff
--- a/admin/ChangeLog Fri Jan 14 12:18:41 2011 -0500 +++ b/admin/ChangeLog Fri Jan 14 09:42:40 2011 -0800 @@ -2,7 +2,6 @@ * admin.el (set-copyright): Also handle \year in refcards/*.tex. -2011-01-14 Eli Zaretskii <eliz@gnu.org> 2011-01-14 Glenn Morris <rgm@gnu.org> * bzrmerge.el: Require cl when compiling.