Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-15

Merge from emacs--cvs-trunk--0

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-95
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-96
   Move Gnus images into etc/images

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-97
 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-105
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-14
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-15
   Update from CVS: lisp/imap.el (imap-log): Doc fix.

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-16
   Merge from emacs--cvs-trunk--0

1 files changed, 11 insertions, 2 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index ac21c3aeabc..dbc48dfa696 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-15  Jason Rumney  <jasonr@gnu.org>
+
+        * nt/makedist.bat: Do not rely on non-standard behaviour of
+        tar --exclude.
+
 2004-11-02  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
         * FOR-RELEASE (Indications): Remove two stage update for toolbar (Done).
@@ -31,7 +36,7 @@
 
         * FOR-RELEASE: Remove entry about GTK and monochrome displays (done).
 
-2002-06-26  Eli Zaretskii  <eliz@is.elta.co.il>
+2004-06-26  Eli Zaretskii  <eliz@is.elta.co.il>
 
         * FOR-RELEASE: Moved here from the etc directory.
 
@@ -44,6 +49,10 @@
         * quick-install-emacs: Don't use "function" keyword when defining
         shell functions.
 
+2003-09-29  Lute Kamstra  <lute@gnu.org>
+
+        * make-tarball.txt: Mention regenerating Emacs' AUTHORS file.
+
 2003-09-27  Miles Bader  <miles@gnu.ai.mit.edu>
 
         * quick-install-emacs: Remove fns-* pruning, since that file no
@@ -193,7 +202,7 @@
         version of tar used.
 
 ;; Local Variables:
-;; coding: iso-2022-7bit-unix
+;; coding: iso-2022-7bit
 ;; End:
 
     Copyright (C) 2001 Free Software Foundation, Inc.