From owner-cvs-all@FreeBSD.ORG  Fri Jan 16 09:59:47 2004
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 8F1D116A4CE; Fri, 16 Jan 2004 09:59:47 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id D42CB43D46; Fri, 16 Jan 2004 09:59:46 -0800 (PST)
	(envelope-from clement@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0GHxk0B095296;
	Fri, 16 Jan 2004 09:59:46 -0800 (PST)
	(envelope-from clement@repoman.freebsd.org)
Received: (from clement@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0GHxkOo095295;
	Fri, 16 Jan 2004 09:59:46 -0800 (PST)
	(envelope-from clement)
Message-Id: <200401161759.i0GHxkOo095295@repoman.freebsd.org>
From: Clement LAFORET <clement@FreeBSD.org>
Date: Fri, 16 Jan 2004 09:59:46 -0800 (PST)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: ports/devel/ace Makefile
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: 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, 16 Jan 2004 17:59:47 -0000

clement     2004/01/16 09:59:46 PST

  FreeBSD ports repository

  Modified files:
    devel/ace            Makefile 
  Log:
  - Fix CONFLICTS
  
  PR:                 61412
  Submitted by:       Sergey Matveychuk <sem@ciam.ru> (maintainer)
  Approved by:        erwin (mentor) (implicitly)
  
  Revision  Changes    Path
  1.3       +1 -1      ports/devel/ace/Makefile