summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2009-01-09 03:22:30 +0000
committerGlenn Morris <rgm@gnu.org>2009-01-09 03:22:30 +0000
commit85dce46f7b48e9f29aef9984abd86f9ff1fb0e33 (patch)
tree531b9d8a497891f3b924410bf3817b076114596c
parent78892d1be9475a5b43bbc39def2f9c552e3adaf1 (diff)
downloademacs-85dce46f7b48e9f29aef9984abd86f9ff1fb0e33.tar.gz
emacs-85dce46f7b48e9f29aef9984abd86f9ff1fb0e33.tar.bz2
emacs-85dce46f7b48e9f29aef9984abd86f9ff1fb0e33.zip
Fix merge error.
-rw-r--r--lisp/gnus/ChangeLog4
1 files changed, 0 insertions, 4 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index f3404816ad6..e0a68e182a6 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -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