From owner-cvs-src@FreeBSD.ORG  Sun Jun 22 12:19:10 2003
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 2A02537B401; Sun, 22 Jun 2003 12:19:10 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id BE02443F85; Sun, 22 Jun 2003 12:19:09 -0700 (PDT)
	(envelope-from ru@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5MJJ90U027228;
	Sun, 22 Jun 2003 12:19:09 -0700 (PDT)
	(envelope-from ru@repoman.freebsd.org)
Received: (from ru@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5MJJ9gB027227;
	Sun, 22 Jun 2003 12:19:09 -0700 (PDT)
Message-Id: <200306221919.h5MJJ9gB027227@repoman.freebsd.org>
From: Ruslan Ermilov <ru@FreeBSD.org>
Date: Sun, 22 Jun 2003 12:19:09 -0700 (PDT)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: CVSROOT modules
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Jun 2003 19:19:10 -0000

ru          2003/06/22 12:19:09 PDT

  FreeBSD src repository

  Modified files:
    .                    modules 
  Log:
  When there is a conflict between RELENG_4 and HEAD, prefer the HEAD path.
  
  Revision  Changes    Path
  1.6843    +5 -5      CVSROOT/modules