From owner-cvs-all@FreeBSD.ORG  Fri Nov 26 19:35:48 2010
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 84988106566B;
	Fri, 26 Nov 2010 19:35:48 +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 5A1B98FC16;
	Fri, 26 Nov 2010 19:35:48 +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 oAQJZmSk081603;
	Fri, 26 Nov 2010 19:35:48 GMT
	(envelope-from tabthorpe@repoman.freebsd.org)
Received: (from tabthorpe@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id oAQJZm2j081602;
	Fri, 26 Nov 2010 19:35:48 GMT (envelope-from tabthorpe)
Message-Id: <201011261935.oAQJZm2j081602@repoman.freebsd.org>
From: Thomas Abthorpe <tabthorpe@FreeBSD.org>
Date: Fri, 26 Nov 2010 19:35:48 +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/editors/komodo-edit 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: Fri, 26 Nov 2010 19:35:48 -0000

tabthorpe    2010-11-26 19:35:48 UTC

  FreeBSD ports repository

  Modified files:
    editors/komodo-edit  Makefile 
  Log:
  - Set CONFLICTS with komodo-ide
  
  Approved by:    maintainer implicit
  
  Revision  Changes    Path
  1.14      +2 -0      ports/editors/komodo-edit/Makefile