*** empty log message ***

[bpt/emacs.git] / msdos / ChangeLog

diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 7479426..f42c887 100644 (file)
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,10 @@
+2000-10-07  Eli Zaretskii  <eliz@is.elta.co.il>
+
+       * sedleim.inp (RUN-EMACS): Remove EMACSLOADPATH setting as part of
+       the command; use Make's "export EMACSLOADPATH=" instead.  Remove
+       the handling of `command` expansion, leim/Makefile.in doesn't use
+       that anymore.
+
 2000-08-29  Eli Zaretskii  <eliz@is.elta.co.il>
 
        * sed2.inp (HAVE_INDEX, HAVE_RINDEX): Define.
@@ -81,6 +88,28 @@
 
        * 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.