1 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 05953344a..0e7f456f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2004-03-29  Christian Persch  <chpe@cvs.gnome.org>
+
+	* configure.in:
+	* po/ChangeLog:
+	* po/gu.po:
+	* po/nn.po:
+	* po/pa.po:
+	* po/pt.po:
+
+	Merged from gnome-2-6 branch.
+
 2004-03-22  Marco Pesenti Gritti  <marco@gnome.org>
 
 	* NEWS: