Fix conflicts
[claws.git] / ChangeLog
index e13214270e1e953b7671b751c50b6ebf855e89d6..65eab4da1ab05d88dc6b99f20c69900ae75465fe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,69 @@
+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
+               add 'go to' menu to separate msgview
+
+2007-10-09 [colin]     3.0.2cvs40
+
+       * src/common/defs.h
+               Add forgotten file
+
+2007-10-09 [iwkse]     3.0.2cvs39
+
+       * Makefile.am
+       * src/addressbook.c
+       * src/addritem.c
+       * src/addritem.h
+       * src/editaddress.c
+       * src/editaddress_other_attributes_ldap.h
+       * src/addrbook.c
+       * src/Makefile.am
+               set a photo in the Addressbook
+
+2007-10-08 [colin]     3.0.2cvs38
+
+       * src/prefs_toolbar.c
+               Make height 320 to remove the scrollbar 
+               (with current number of icons)
+
+2007-10-08 [colin]     3.0.2cvs37
+
+       * src/prefs_toolbar.c
+               Transform the treeview to a GtkIconView.
+               Patch by Pawel
+               In addition, transform the window so that 
+               it looks like a popup menu. Patch by me
+
+2007-10-08 [colin]     3.0.2cvs36
+
+       * src/compose.c
+       * src/compose.h
+               Beautify the GUI a bit; in particular, show the
+               number of attachments in the tab's title.
+               Patch by Pawel
+
+2007-10-08 [paul]      3.0.2cvs35
+
+       * src/mimeview.c
+               Save users from themselves: save temporary
+               files used for Open/Open with as read-only.
+               Thanks to Colin
+
+2007-10-08 [paul]      3.0.2cvs34
+
+       * tools/Makefile.am
+               forgot this in cvs33
+
 2007-10-08 [paul]      3.0.2cvs33
 
        * tools/kdeservicemenu/README