From owner-cvs-all@FreeBSD.ORG  Tue Dec  7 20:38:18 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 14950106564A;
	Tue,  7 Dec 2010 20:38:18 +0000 (UTC)
	(envelope-from pgollucci@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E03EC8FC08;
	Tue,  7 Dec 2010 20:38:17 +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 oB7KcHrg035559;
	Tue, 7 Dec 2010 20:38:17 GMT
	(envelope-from pgollucci@repoman.freebsd.org)
Received: (from pgollucci@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id oB7KcHwV035558;
	Tue, 7 Dec 2010 20:38:17 GMT (envelope-from pgollucci)
Message-Id: <201012072038.oB7KcHwV035558@repoman.freebsd.org>
From: "Philip M. Gollucci" <pgollucci@FreeBSD.org>
Date: Tue, 7 Dec 2010 20:38:17 +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/apache22 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, 07 Dec 2010 20:38:18 -0000

pgollucci    2010-12-07 20:38:17 UTC

  FreeBSD ports repository

  Modified files:
    www/apache22         Makefile 
  Log:
  - update conflicts
  
  Revision  Changes    Path
  1.285     +2 -1      ports/www/apache22/Makefile