From owner-cvs-all  Tue Feb 19  4:23:17 2002
Delivered-To: cvs-all@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP
	id A69C337B405; Tue, 19 Feb 2002 04:22:59 -0800 (PST)
Received: (from murray@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g1JCMxM51641;
	Tue, 19 Feb 2002 04:22:59 -0800 (PST)
	(envelope-from murray)
Message-Id: <200202191222.g1JCMxM51641@freefall.freebsd.org>
From: Murray Stokely <murray@FreeBSD.org>
Date: Tue, 19 Feb 2002 04:22:59 -0800 (PST)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/contrib/isc-dhcp/common tables.c src/contrib/isc-dhcp/includes/cf
         freebsd.h src/contrib/isc-dhcp/minires ns_parse.c
X-FreeBSD-CVS-Branch: HEAD
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
List-ID: <cvs-all.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20cvs-all>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20cvs-all>
X-Loop: FreeBSD.ORG

murray      2002/02/19 04:22:59 PST

  Modified files:
    contrib/isc-dhcp/common tables.c 
    contrib/isc-dhcp/includes/cf freebsd.h 
    contrib/isc-dhcp/minires ns_parse.c 
  Log:
  Resolve conflicts.
  
  Revision  Changes    Path
  1.7       +837 -282  src/contrib/isc-dhcp/common/tables.c
  1.4       +73 -16    src/contrib/isc-dhcp/includes/cf/freebsd.h
  1.2       +4 -0      src/contrib/isc-dhcp/minires/ns_parse.c

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message