*** empty log message ***

[bpt/emacs.git] / etc / ChangeLog

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 8895d7f..d4fd37e 100644 (file)
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-14  Nick Roberts  <nick@nick.uklinux.net>
+
+       * NEWS: Merge in the changes for versions 21.2 and 21.3 as
+       documented on the EMACS_21_1_RC branch.
+
 2003-03-03  Chao-Hong Liu  <chliu@gnu.org>
 
        * TUTORIAL.cn: Updated.