From: Colin Leroy <colin@colino.net>
Date: Fri, 13 Aug 2004 06:32:35 +0000 (+0000)
Subject: sync with HEAD 0.9.12cvs60
X-Git-Tag: gtk2_win32_last_merge~223
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=2bd5d3084a4874fdd707a8e9eae9d724abb45b5d

sync with HEAD 0.9.12cvs60
---

diff --git a/ChangeLog.claws b/ChangeLog.claws
index bbe4867f7..a28107b1e 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,4 +1,23 @@
-2004-08-10 [leroyc]	0.9.12cvs57
+2004-08-12 [christoph]	0.9.12cvs60
+
+	* src/folderutils.c
+		fix bug that did not thaw folder updates when deleting
+		duplicates in empty folders
+
+2004-08-12 [colin]	0.9.12cvs59
+
+	* src/plugins/trayicon/trayicon.c
+		Add a context menu with most common operations
+
+2004-08-12 [colin]	0.9.12cvs58
+
+	* configure.ac
+	* sylpheed.desktop
+	* src/Makefile.am
+	* src/main.c
+		Add support for Freedesktop.org's startup notification
+
+2004-08-10 [colin]	0.9.12cvs57
 
 	* src/main.c
 	* src/common/socket.c