[SM-Commit] GIT changes to master z-rejected grimoire by Vlad Glagolev (5450e10b4fbf70ccccff9e7c2683c4f3872e6e7f)

Vlad Glagolev scm at sourcemage.org
Wed Jan 18 22:21:42 EST 2012


GIT changes to master z-rejected grimoire by Vlad Glagolev <stealth at sourcemage.org>:

 z-mail/netqmail/CONFLICTS |    1 +
 z-mail/netqmail/HISTORY   |    3 +++
 z-mail/qmail/CONFLICTS    |    1 +
 z-mail/qmail/HISTORY      |    3 +++
 4 files changed, 8 insertions(+)

New commits:
commit 3a789b8ad65ab127de43d68fbdeb1d7f6ed3fca7
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    qmail: conflicts masqmail

commit 5ecc858b74c5dc0adb39ad8ab49b9d80a148aa99
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    netqmail: conflicts masqmail

diff --git a/z-mail/netqmail/CONFLICTS b/z-mail/netqmail/CONFLICTS
index b5654bf..d6d161d 100755
--- a/z-mail/netqmail/CONFLICTS
+++ b/z-mail/netqmail/CONFLICTS
@@ -1,3 +1,4 @@
+conflicts  masqmail   &&
 conflicts  exim       &&
 conflicts  qmail      &&
 conflicts  sendmail   &&
diff --git a/z-mail/netqmail/HISTORY b/z-mail/netqmail/HISTORY
index 3f18e80..fcc5fae 100644
--- a/z-mail/netqmail/HISTORY
+++ b/z-mail/netqmail/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Vlad Glagolev <stealth at sourcemage.org>
+	* CONFLICTS: added masqmail
+
 2007-04-01 Jeremy Blosser <jblosser-smgl at firinn.org>
 	* DETAILS: Update WEB_SITE, SHORT, and description.
 
diff --git a/z-mail/qmail/CONFLICTS b/z-mail/qmail/CONFLICTS
index 6496d05..3c0a6f0 100755
--- a/z-mail/qmail/CONFLICTS
+++ b/z-mail/qmail/CONFLICTS
@@ -1,3 +1,4 @@
+conflicts  masqmail   &&
 conflicts  exim       &&
 conflicts  netqmail   &&
 conflicts  sendmail   &&
diff --git a/z-mail/qmail/HISTORY b/z-mail/qmail/HISTORY
index b9f5c5f..f8ced40 100644
--- a/z-mail/qmail/HISTORY
+++ b/z-mail/qmail/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Vlad Glagolev <stealth at sourcemage.org>
+	* CONFLICTS: added masqmail
+
 2007-04-07 Jeremy Blosser <jblosser-smgl at firinn.org>
 	* CONFIGURE, PRE_BUILD, patches/qmail-dns-patch: Add oversized DNS
 	  response patch.


More information about the SM-Commit mailing list