From owner-cvs-src@FreeBSD.ORG  Tue Sep  2 04:13:22 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 7583816A4BF; Tue,  2 Sep 2003 04:13:22 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 8C74543FEA; Tue,  2 Sep 2003 04:13:21 -0700 (PDT)
	(envelope-from mbr@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 h82BDL0U057496;
	Tue, 2 Sep 2003 04:13:21 -0700 (PDT)
	(envelope-from mbr@repoman.freebsd.org)
Received: (from mbr@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h82BDLB0057495;
	Tue, 2 Sep 2003 04:13:21 -0700 (PDT)
Message-Id: <200309021113.h82BDLB0057495@repoman.freebsd.org>
From: Martin Blapp <mbr@FreeBSD.org>
Date: Tue, 2 Sep 2003 04:13:21 -0700 (PDT)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/contrib/isc-dhcp/client clparse.c dhclient.conf.5
 src/contrib/isc-dhcp/common dhcp-options.5 tables.c
 src/contrib/isc-dhcp/includes dhcpd.h
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: Tue, 02 Sep 2003 11:13:22 -0000

mbr         2003/09/02 04:13:21 PDT

  FreeBSD src repository

  Modified files:
    contrib/isc-dhcp/client clparse.c dhclient.conf.5 
    contrib/isc-dhcp/common dhcp-options.5 tables.c 
    contrib/isc-dhcp/includes dhcpd.h 
  Log:
  Resolve conflicts.
  
  Revision  Changes    Path
  1.11      +17 -10    src/contrib/isc-dhcp/client/clparse.c
  1.13      +2 -2      src/contrib/isc-dhcp/client/dhclient.conf.5
  1.6       +15 -15    src/contrib/isc-dhcp/common/dhcp-options.5
  1.10      +660 -659  src/contrib/isc-dhcp/common/tables.c
  1.8       +5 -0      src/contrib/isc-dhcp/includes/dhcpd.h