*** empty log message ***

1 files changed, 22 insertions, 0 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 6bfb1418333..6165aa7b845 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -161,6 +161,28 @@
 
         * TUTORIAL.ro: Change copyright statement.
 
+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-30  Paul Eggert  <eggert@twinsun.com>
+
+        * PROBLEMS: Update Solaris 2.6 and 7 problems.
+
 1999-07-12  Richard Stallman  <rms@gnu.org>
 
         * Version 20.4 released.