Mercurial > emacs
changeset 100996:4b04254322f8
Fix merge error.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Fri, 09 Jan 2009 03:22:30 +0000 |
| parents | 89695da9e88c |
| children | 0e99f90c4347 |
| files | lisp/gnus/ChangeLog |
| diffstat | 1 files changed, 0 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Fri Jan 09 03:19:39 2009 +0000 +++ b/lisp/gnus/ChangeLog Fri Jan 09 03:22:30 2009 +0000 @@ -122,10 +122,6 @@ * mm-util.el (mm-charset-override-alist): Declare for compiler. -2008-12-16 Glenn Morris <rgm@gnu.org> - - * mm-util.el (mm-charset-override-alist): Declare for compiler. - 2008-12-15 Katsumi Yamaoka <yamaoka@jpl.org> * mml.el (mml-generate-mime-1): Prefer the MIME charset that Emacs