From owner-cvs-all@FreeBSD.ORG  Thu Sep 30 09:45:23 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 E3777106566B;
	Thu, 30 Sep 2010 09:45:23 +0000 (UTC) (envelope-from osa@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id BACB98FC08;
	Thu, 30 Sep 2010 09:45:23 +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 o8U9jN2F016996;
	Thu, 30 Sep 2010 09:45:23 GMT (envelope-from osa@repoman.freebsd.org)
Received: (from osa@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o8U9jNvq016995;
	Thu, 30 Sep 2010 09:45:23 GMT (envelope-from osa)
Message-Id: <201009300945.o8U9jNvq016995@repoman.freebsd.org>
From: "Sergey A. Osokin" <osa@FreeBSD.org>
Date: Thu, 30 Sep 2010 09:45:23 +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/nginx-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: Thu, 30 Sep 2010 09:45:24 -0000

osa         2010-09-30 09:45:23 UTC

  FreeBSD ports repository

  Modified files:
    www/nginx-devel      Makefile 
  Log:
  Fix CONFLICTS.
  
  Bump PORTREVISION.
  
  PR:     ports/151072
  
  Revision  Changes    Path
  1.348     +2 -1      ports/www/nginx-devel/Makefile