1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 202349978..595d19072 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-01-19  Christian Persch  <chpe@cvs.gnome.org>
+
+	* NEWS:
+
+	Merge from gnome-2-4 branch.
+
 2004-01-19  Marco Pesenti Gritti  <marco@gnome.org>
 
 	* lib/eel-gconf-extensions.c: (tilde_compress),