Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 274-284)

   - Update from CVS
   - Update etc/MORE.STUFF.
   - Merge from gnus--rel--5.10

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

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-62

2 files changed, 5 insertions, 0 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 2e8581a6f57..16c4e538939 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+2006-05-13  Eli Zaretskii  <eliz@gnu.org>
+
+        * makefile.w32-in (lisp1): Add fringe.elc.
+
 2006-05-02  Francesco Potort,Al(B  <pot@gnu.org>
 
         * etags.c (Perl_functions): Free space allocated for var package.
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 10b7c07f5c2..c145e47f197 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -192,6 +192,7 @@ lisp1= \
         $(lispsource)international/mule-conf.el \
         $(lispsource)international/mule-cmds.elc \
         $(lispsource)international/characters.elc \
+        $(lispsource)fringe.elc \
         $(lispsource)image.elc \
         $(lispsource)international/fontset.elc \
         $(lispsource)dnd.elc \