1 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 6faa13414..0487811a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-05-11  Christian Persch  <chpe@cvs.gnome.org>
+
+	* data/Makefile.am:
+	* data/default-prefs-common.js:
+	R data/default-prefs-gecko-1-8.js:
+	R data/default-prefs-mozilla.js:
+	R data/default-prefs-toolkit.js:
+
+	Merge those into -common prefs.
+
 2006-05-11  Wouter Bolsterlee  <uws+gnome@xs4all.nl>
 
 	* src/ephy-find-toolbar.c: (ephy_find_toolbar_find_next),