Revision: miles@gnu.org--gnu-2005/gnus--devo--0--patch-199

Merge from gnus--rel--5.10

Patches applied:

 * emacs--cvs-trunk--0  (patch 530, 536, 540-541)

   - Merge from gnus--rel--5.10
   - Update from CVS

 * gnus--rel--5.10  (patch 116)

   - Merge from emacs--cvs-trunk--0

diff --git a/lisp/ChangeLog.2 b/lisp/ChangeLog.2
index 5d7a608..f39bf52 100644 (file)
--- a/lisp/ChangeLog.2
+++ b/lisp/ChangeLog.2
@@ -7658,7 +7658,7 @@
 
        * spam.el: more compilation fixes for BBDB
 
-       * spam-stat.el added code from Alex Schroeder <alex@gnu.org>
+       * spam-stat.el: added code from Alex Schroeder <alex@gnu.org>
        (spam-stat-reduce-size): Interactive.
        (spam-stat-reset): New function.
        (spam-stat-save): Interactive.
@@ -12404,7 +12404,7 @@
 
 2001-12-05  Katsumi Yamaoka  <yamaoka@jpl.org>
 
-       * mm-view.wl (mm-inline-text): Decode a charset-encoded rich text.
+       * mm-view.el (mm-inline-text): Decode a charset-encoded rich text.
 
 2001-12-04 08:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>