aboutsummaryrefslogtreecommitdiffstats
path: root/mail/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'mail/ChangeLog')
-rw-r--r--mail/ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 771310c08a..280dbcddfe 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-20 Jeffrey Stedfast <fejj@ximian.com>
+
+ * mail-ops.c (filter_folder_filter): Don't expunge the source
+ folder if we have a cache.
+
2001-07-20 Dan Winship <danw@ximian.com>
* mail-mt.c (mail_msgport_replied): Use mail_msg_destroy rather
@@ -47,6 +52,7 @@
(destination_folder_handle_motion): Ditto.
(destination_folder_handle_drop): Ditto.
+>>>>>>> 1.1426
2001-07-19 Not Zed <NotZed@Ximian.com>
* mail-local.c (reconfigure_folder_reconfigure): remvoed