2007-10-09 [iwkse] 3.0.2cvs43

[claws.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index b3884aae0406e412225139a03c8e20194ed92c60..6994839cbdfba69c1786fda7f2eb5d3710212175 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,21 @@
+2007-10-09 [iwkse]     3.0.2cvs43
+
+       * src/gtk/about.c
+               center the about window
+
+<<<<<<< ChangeLog
+2007-10-09 [iwkse]     3.0.2cvs42
+
+       * 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
 
+>>>>>>> 1.396.2.2087
 2007-10-09 [paul]      3.0.2cvs41
 
        * src/messageview.c