Replace confusing (,@ with ,

[gnu-emacs] / lib-src / ChangeLog

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 359d9723e03f04e6277e333a48670b89fba6b37f..3b683b8224fd218a861c90b3268c456a0623cc7a 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,20 @@
+2000-09-25  Dave Love  <fx@gnu.org>
+
+       * sorted-doc.c: Include config.h.
+       [!HAVE_STDLIB_H]: Declare malloc.
+
+2000-09-14  Andrew Innes  <andrewi@gnu.org>
+
+       * makefile.w32-in: Revert to Unix line endings.
+
+2000-09-04  Dave Love  <fx@gnu.org>
+
+       * movemail.c (index, rindex): Prototype conditionally.
+
+2000-09-03  Andrew Innes  <andrewi@gnu.org>
+
+       * makefile.w32-in: Change to DOS line endings.
+
 2000-09-01  Eli Zaretskii  <eliz@is.elta.co.il>
 
        * movemail.c (toplevel): Remove redundant fcntl.h.
@@ -452,6 +469,33 @@
        * grep-changelog: New.
        * Makefile.in (INSTALLABLE_SCRIPTS): Add it.
 
+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-11-13  Gerd Moellmann  <gerd@gnu.org>
+
+       * Makefile.in (b2m): Add dependency on GETOPTDEPS.
+
+1999-11-03  Gerd Moellmann  <gerd@gnu.org>
+
+       * emacsclient.c, etags.c: Change email address to send bugs
+       to.
+
 1999-07-12  Richard Stallman  <rms@gnu.org>
 
        * Version 20.4 released.