[Emacs-diffs] emacs/lisp/gnus ChangeLog

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/01/09 03:22:31

Modified files:
        lisp/gnus      : ChangeLog 

Log message:
        Fix merge error.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/gnus/ChangeLog?cvsroot=emacs&r1=1.786&r2=1.787

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/gnus/ChangeLog,v
retrieving revision 1.786
retrieving revision 1.787
diff -u -b -r1.786 -r1.787
--- ChangeLog   9 Jan 2009 03:01:51 -0000       1.786
+++ ChangeLog   9 Jan 2009 03:22:30 -0000       1.787
@@ -122,10 +122,6 @@
 
        * mm-util.el (mm-charset-override-alist): Declare for compiler.
 
-2008-12-16  Glenn Morris  <address@hidden>
-
-       * mm-util.el (mm-charset-override-alist): Declare for compiler.
-
 2008-12-15  Katsumi Yamaoka  <address@hidden>
 
        * mml.el (mml-generate-mime-1): Prefer the MIME charset that Emacs