From owner-cvs-ports@FreeBSD.ORG  Wed Jul  2 21:48:30 2008
Return-Path: <owner-cvs-ports@FreeBSD.ORG>
Delivered-To: cvs-ports@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 18289106568F;
	Wed,  2 Jul 2008 21:48:30 +0000 (UTC)
	(envelope-from edwin@mavetju.org)
Received: from mail5out.barnet.com.au (mail5.barnet.com.au [202.83.178.78])
	by mx1.freebsd.org (Postfix) with ESMTP id C9C948FC28;
	Wed,  2 Jul 2008 21:48:29 +0000 (UTC)
	(envelope-from edwin@mavetju.org)
Received: by mail5out.barnet.com.au (Postfix, from userid 1001)
	id 1D8032218A25; Thu,  3 Jul 2008 07:48:29 +1000 (EST)
X-Viruscan-Id: <486BF7AC00011984DE757A@BarNet>
Received: from mail5auth.barnet.com.au (mail5.barnet.com.au [202.83.178.78])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(Client CN "mail5auth.barnet.com.au",
	Issuer "*.barnet.com.au" (verified OK))
	by mail5.barnet.com.au (Postfix) with ESMTP id D017821B39FE;
	Thu,  3 Jul 2008 07:48:28 +1000 (EST)
Received: from k7.mavetju (unknown [10.10.26.10])
	by mail5auth.barnet.com.au (Postfix) with ESMTP id 8F8E3221882A;
	Thu,  3 Jul 2008 07:48:28 +1000 (EST)
Received: by k7.mavetju (Postfix, from userid 1001)
	id 9703F99C; Thu,  3 Jul 2008 07:48:11 +1000 (EST)
Date: Thu, 3 Jul 2008 07:48:11 +1000
From: Edwin Groothuis <edwin@mavetju.org>
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org,
	cvs-all@FreeBSD.org
Message-ID: <20080702214811.GB66593@k7.mavetju>
References: <200807021302.m62D2Adv034959@repoman.freebsd.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <200807021302.m62D2Adv034959@repoman.freebsd.org>
User-Agent: Mutt/1.4.2.3i
Cc: 
Subject: Re: cvs commit: CVSROOT modules
X-BeenThere: cvs-ports@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the ports tree <cvs-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-ports>
List-Post: <mailto:cvs-ports@freebsd.org>
List-Help: <mailto:cvs-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 02 Jul 2008 21:48:30 -0000

On Wed, Jul 02, 2008 at 01:02:10PM +0000, Edwin Groothuis wrote:
> edwin       2008-07-02 13:02:10 UTC
> 
>   FreeBSD ports repository
> 
>   Modified files:
>     .                    modules 
>   Log:
>   Ports modules update at Wednesday 02 July 2008 at 22:59
>   
>   Revision  Changes    Path
>   1.20077   +2 -0      CVSROOT/modules

For the record, this one added the string "# !!MERGE!!" back to it so
the script to update CVSROOT/modules works again for this.

Edwin

-- 
Edwin Groothuis      |            Personal website: http://www.mavetju.org
edwin@mavetju.org    |              Weblog: http://www.mavetju.org/weblog/