*** empty log message ***

1 files changed, 27 insertions, 0 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index db25bef2cda..361909f60d2 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -464,6 +464,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.