diff options
author | Vlad Glagolev | 2012-01-19 07:11:23 +0400 |
---|---|---|
committer | Vlad Glagolev | 2012-01-19 07:11:23 +0400 |
commit | 4440ece4400d634bc02e4232160e2dbd039abfe3 (patch) | |
tree | 1aa02c1a9545f06e3f3d34123f2ef110089db19e | |
parent | a99a956b335571f7bdc4a0e3c4cc07e302f86b76 (diff) |
courier: conflicts masqmail
-rwxr-xr-x | mail/courier/CONFLICTS | 1 | ||||
-rw-r--r-- | mail/courier/HISTORY | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/mail/courier/CONFLICTS b/mail/courier/CONFLICTS index d60101b952..36fa790a71 100755 --- a/mail/courier/CONFLICTS +++ b/mail/courier/CONFLICTS @@ -1,4 +1,5 @@ conflicts courier-imap && +conflicts masqmail && conflicts esmtp && conflicts exim && conflicts postfix && diff --git a/mail/courier/HISTORY b/mail/courier/HISTORY index 8bbee30899..496ca4e901 100644 --- a/mail/courier/HISTORY +++ b/mail/courier/HISTORY @@ -1,3 +1,6 @@ +2012-01-19 Vlad Glagolev <stealth@sourcemage.org> + * CONFLICTS: added masqmail + 2011-03-27 Remko van der Vossen <wich@sourcemage.org> * DETAILS: version 0.65.3 * init.d/*: simplified and use smgl_init (working NEEDS) |