From owner-cvs-all@FreeBSD.ORG  Thu Jun  7 15:03:15 2012
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9AFBF1065674;
	Thu,  7 Jun 2012 15:03:15 +0000 (UTC)
	(envelope-from tabthorpe@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 6ED6A8FC22;
	Thu,  7 Jun 2012 15:03:15 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id q57F3FCo041438;
	Thu, 7 Jun 2012 15:03:15 GMT
	(envelope-from tabthorpe@repoman.freebsd.org)
Received: (from tabthorpe@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id q57F3FpN041437;
	Thu, 7 Jun 2012 15:03:15 GMT (envelope-from tabthorpe)
Message-Id: <201206071503.q57F3FpN041437@repoman.freebsd.org>
From: Thomas Abthorpe <tabthorpe@FreeBSD.org>
Date: Thu, 7 Jun 2012 15:03:15 +0000 (UTC)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: ports/mail/squirrelmail Makefile
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the entire tree
	<cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Jun 2012 15:03:15 -0000

tabthorpe    2012-06-07 15:03:15 UTC

  FreeBSD ports repository

  Modified files:
    mail/squirrelmail    Makefile 
  Log:
  - Mark CONFLICTS with squirreloutlook
  
  Submitted by:   ketasbot
  
  Revision  Changes    Path
  1.74      +2 -0      ports/mail/squirrelmail/Makefile