summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVlad Glagolev2012-01-19 07:18:39 +0400
committerVlad Glagolev2012-01-19 07:18:39 +0400
commite3cfcc56db91b6f2ff30a6ed6e3904a7e8ac1d63 (patch)
treeabecf8a73bbe85e357a52b3438e98f3075d659d9
parent4794c3e84c753796cd563da17e52ea44c0d6b684 (diff)
qmail: conflicts masqmail
-rwxr-xr-xmail/qmail/CONFLICTS1
-rw-r--r--mail/qmail/HISTORY3
2 files changed, 4 insertions, 0 deletions
diff --git a/mail/qmail/CONFLICTS b/mail/qmail/CONFLICTS
index 6496d05560..3c0a6f0aef 100755
--- a/mail/qmail/CONFLICTS
+++ b/mail/qmail/CONFLICTS
@@ -1,3 +1,4 @@
+conflicts masqmail &&
conflicts exim &&
conflicts netqmail &&
conflicts sendmail &&
diff --git a/mail/qmail/HISTORY b/mail/qmail/HISTORY
index b05ddd1d71..287eff917d 100644
--- a/mail/qmail/HISTORY
+++ b/mail/qmail/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Vlad Glagolev <stealth@sourcemage.org>
+ * CONFLICTS: added masqmail
+
2010-04-20 Dave Josephsen <dave@sourcemage.org>
* CONFIGURE, PRE_BUILD, patches/qmail-tls-patch: Add TLS patch