1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 56fe086c2..2fb1ff40f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2004-08-23  Christian Persch  <chpe@cvs.gnome.org>
 
+	* NEWS:
+
+	Merge from gnome-2-6 branch.
+
+2004-08-23  Christian Persch  <chpe@cvs.gnome.org>
+
 	* lib/widgets/ephy-label.c: (ephy_label_size_allocate):
 
 	Fix a warning when moving tabs between windows; see bug #150822.