aboutsummaryrefslogtreecommitdiffstats
path: root/mail/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'mail/ChangeLog')
-rw-r--r--mail/ChangeLog10
1 files changed, 10 insertions, 0 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 22f641e13d..66b63e3c35 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,11 @@
+<<<<<<< ChangeLog
+<<<<<<< ChangeLog
+2000-08-09 Not Zed <NotZed@HelixCode.com>
+
+ * mail-autofilter.c: New file to hold auto filter/vfolder stuff.
+
+=======
+=======
2000-08-09 Christopher James Lahey <clahey@helixcode.com>
* mail-display.c, mail-format.c, mail-ops.c: Fixed some warnings.
@@ -10,6 +18,7 @@
* folder-browser-factory.c (control_activate): Create a "print
message" menu item.
+>>>>>>> 1.381
2000-08-09 Jeffrey Stedfast <fejj@helixcode.com>
* message-list.c (message_list_init): Attached a double_click
@@ -53,6 +62,7 @@
(message_list_init): Added a right_click event to trigger a pop-up
menu to be displayed
+>>>>>>> 1.379
2000-08-08 Dan Winship <danw@helixcode.com>
* mail-config-gui.c: Add "Don't delete messages from server"