Fix conflicts

[claws.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 5021add1ddafbd05cab9a0574826f3d76ad13c92..65eab4da1ab05d88dc6b99f20c69900ae75465fe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-10-09 [iwkse]     3.0.2cvs43
+
+       * src/gtk/about.c
+               center the about window
+
+2007-10-09 [paul]      3.0.2cvs42
+
+       * src/prefs_toolbar.c
+               fix icon selector window on maemo
+
 2007-10-09 [paul]      3.0.2cvs41
 
        * src/messageview.c