summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVlad Glagolev2012-01-19 07:09:56 +0400
committerVlad Glagolev2012-01-19 07:09:56 +0400
commita99a956b335571f7bdc4a0e3c4cc07e302f86b76 (patch)
tree8eb3cc94f19197087c4ddf8e565bc439eb3b968a
parent18b3fbeff8684bf622b2ec65703d535ac1049fa3 (diff)
exim: conflicts masqmail
-rwxr-xr-xmail/exim/CONFLICTS1
-rw-r--r--mail/exim/HISTORY3
2 files changed, 4 insertions, 0 deletions
diff --git a/mail/exim/CONFLICTS b/mail/exim/CONFLICTS
index 91e224b3f3..d8f360d343 100755
--- a/mail/exim/CONFLICTS
+++ b/mail/exim/CONFLICTS
@@ -1,3 +1,4 @@
+conflicts masqmail &&
conflicts courier &&
conflicts esmtp &&
conflicts postfix &&
diff --git a/mail/exim/HISTORY b/mail/exim/HISTORY
index 902294025a..3d9d4dd608 100644
--- a/mail/exim/HISTORY
+++ b/mail/exim/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Vlad Glagolev <stealth@sourcemage.org>
+ * CONFLICTS: added masqmail
+
2011-10-10 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 4.77; SECURITY_PATCH++