From owner-cvs-all@FreeBSD.ORG  Tue Nov 10 11:09:37 2009
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 18457106566B;
	Tue, 10 Nov 2009 11:09:37 +0000 (UTC)
	(envelope-from maho@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E2F7F8FC16;
	Tue, 10 Nov 2009 11:09:36 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nAAB9ao9057878;
	Tue, 10 Nov 2009 11:09:36 GMT
	(envelope-from maho@repoman.freebsd.org)
Received: (from maho@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAAB9abt057877;
	Tue, 10 Nov 2009 11:09:36 GMT (envelope-from maho)
Message-Id: <200911101109.nAAB9abt057877@repoman.freebsd.org>
From: Maho Nakata <maho@FreeBSD.org>
Date: Tue, 10 Nov 2009 11:09:36 +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/math/atlas Makefile ports/math/atlas-devel
 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: Tue, 10 Nov 2009 11:09:37 -0000

maho        2009-11-10 11:09:36 UTC

  FreeBSD ports repository

  Modified files:
    math/atlas           Makefile 
    math/atlas-devel     Makefile 
  Log:
  Add conflict line.
  
  Submitted by:   "b. f." <bf1783@googlemail.com>
  
  Revision  Changes    Path
  1.59      +1 -0      ports/math/atlas-devel/Makefile
  1.61      +1 -0      ports/math/atlas/Makefile