Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-357
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-358
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-359
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-360
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-361
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-362
   Support " [...]" style defaults in minibuffer-electric-default-mode

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-363
   (read-number): Use canonical format for default in prompt.

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-364
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-365
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-184

1 files changed, 8 insertions, 3 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index ac789eb3181..9f3fcc13371 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,6 +1,11 @@
+2004-06-01  Juanma Barranquero  <lektu@terra.es>
+
+        * makefile.w32-in (obj): Add image.c.
+
 2004-05-10  Thien-Thi Nguyen  <ttn@gnu.org>
 
-        * test-distrib.c (main): For failing cases, exit with `EXIT_FAILURE'.
+        * test-distrib.c (main): For failing cases, exit with
+        `EXIT_FAILURE'.
 
 2004-05-08  Jason Rumney  <jasonr@gnu.org>
 
@@ -14,8 +19,8 @@
         (main): Use `EXIT_SUCCESS' or `EXIT_FAILURE' for return value.
 
         * ebrowse.c, emacsclient.c, fakemail.c, hexl.c,
-        make-docfile.c, movemail.c, profile.c, sorted-doc.c,
-        test-distrib.c, update-game-score.c, yow.c: Likewise.
+        * make-docfile.c, movemail.c, profile.c, sorted-doc.c,
+        * test-distrib.c, update-game-score.c, yow.c: Likewise.
 
 2004-05-08  Thien-Thi Nguyen  <ttn@gnu.org>