aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 45bb07330f..0acee52114 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -42,7 +42,6 @@
* mail-display.c (load_content_loaded): Make sure the mail-display
object is still "alive" before accessing any of it's data.
->>>>>>> 1.1943.2.6
2001-11-14 Zbigniew Chyla <cyba@gnome.pl>
* mail-autofilter.c (rule_match_recipients, rule_from_message,
href='/~lantw44/cgit/cgit.cgi/freebsd-ports-gnome/log/?h=gnome-3.24&id=c8953a94bc1d9e2bc6bf7a3afc40284d6147d80a'>root/java/netbeans55/Makefile
Commit message (Expand)AuthorAgeFilesLines
* Reset nemoliu due to maintainer-timeouts and no response to email.linimon2008-12-081-1/+1
* Bump portrevision due to upgrade of devel/gettext.edwin2008-06-061-0/+1
* - update to 5.5.1nemoliu2007-12-141-6/+3
* BROKEN: Unfetchablekris2007-07-291-0/+2
* - Welcome X.org 7.2 \o/.flz2007-05-20