From owner-cvs-all@FreeBSD.ORG  Wed Feb  1 09:49:58 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 762C0106564A;
	Wed,  1 Feb 2012 09:49:58 +0000 (UTC) (envelope-from flo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 45D758FC15;
	Wed,  1 Feb 2012 09:49:58 +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 q119nwSM007562;
	Wed, 1 Feb 2012 09:49:58 GMT (envelope-from flo@repoman.freebsd.org)
Received: (from flo@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id q119nw4j007561;
	Wed, 1 Feb 2012 09:49:58 GMT (envelope-from flo)
Message-Id: <201202010949.q119nw4j007561@repoman.freebsd.org>
From: Florian Smeets <flo@FreeBSD.org>
Date: Wed, 1 Feb 2012 09:49:58 +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/www/firefox 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: Wed, 01 Feb 2012 09:49:58 -0000

flo         2012-02-01 09:49:58 UTC

  FreeBSD ports repository

  Modified files:
    www/firefox          Makefile 
  Log:
  fix merge conflict
  
  This gets the PGO build starting but it still does not finish
  
  Revision  Changes    Path
  1.261     +0 -2      ports/www/firefox/Makefile