aboutsummaryrefslogtreecommitdiffstats
path: root/mail/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'mail/ChangeLog')
-rw-r--r--mail/ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 6ae2d17b7b..cc7326654e 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-05 Jeffrey Stedfast <fejj@ximian.com>
+
+ * mail-mt.c (pass_got): Fix a merge-conflict leftover.
+
2001-10-05 <NotZed@Ximian.com>
* folder-browser.c: reformatted the menu tables so they're a bit