*** empty log message ***

[gnu-emacs] / msdos / ChangeLog

diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 4a7acf750ab29967f5817bdb26e465da35b1d616..faffd4aec6e29c883293a09672892fbb0dc37aa7 100644 (file)
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-06  Eli Zaretskii  <eliz@is.elta.co.il>
+
+       * sed2.inp: Ifdef away the test for !HAVE_MKTIME, to avoid parse
+       error in "gcc -E -traditional" with GCC 3.0.
+
 2001-04-02  Eli Zaretskii  <eliz@is.elta.co.il>
 
        * sedleim.inp (srcdir=): Edit @srcdir@ into an absolute file name
@@ -128,28 +133,6 @@
 
        * sedleim.inp (SHELL, MAKESHELL): Use /xyzzy/command as the shell.
 
-After the release of 20.4, development was split into two separate
-code lines.  One line contained the code for Emacs 21, and the other
-one the code for the 20.x releases after 20.4.  The following change
-log entries up to the entry ``20.4 released'' are for the 20.x code
-line.  Change logs above this notice are those for the 21.x code line.
-
-2000-06-13  Gerd Moellmann  <gerd@gnu.org>
-
-       * Version 20.7 released.
-       
-2000-02-26  Gerd Moellmann  <gerd@gnu.org>
-
-       * Version 20.6 released.
-       
-1999-12-04  Gerd Moellmann  <gerd@gnu.org>
-
-       * Version 20.5 released.
-       
-1999-07-29  Eli Zaretskii  <eliz@gnu.org>
-
-       * sedleim.inp (SHELL, MAKESHELL): Use /xyzzy/command as the shell.
-
 1999-07-12  Richard Stallman  <rms@gnu.org>
 
        * Version 20.4 released.