From owner-cvs-src@FreeBSD.ORG  Sat Jun 26 10:38:22 2004
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 DA49616A4CE; Sat, 26 Jun 2004 10:38:22 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id D84BF43D55; Sat, 26 Jun 2004 10:38:22 +0000 (GMT)
	(envelope-from mbr@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5QAbgdg058891;
	Sat, 26 Jun 2004 10:37:42 GMT
	(envelope-from mbr@repoman.freebsd.org)
Received: (from mbr@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5QAbgUD058890;
	Sat, 26 Jun 2004 10:37:42 GMT
	(envelope-from mbr)
Message-Id: <200406261037.i5QAbgUD058890@repoman.freebsd.org>
From: Martin Blapp <mbr@FreeBSD.org>
Date: Sat, 26 Jun 2004 10:37:42 +0000 (UTC)
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 ANONCVS CHANGES COPYRIGHT
 FREEBSD-upgrade src/contrib/isc-dhcp/client clparse.c
 dhclient-script.8 dhclient.8 dhclient.c dhclient.conf.5
 dhclient.leases.5 src/contrib/isc-dhcp/client/scripts freebsd ...
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: Sat, 26 Jun 2004 10:38:23 -0000

mbr         2004-06-26 10:37:42 UTC

  FreeBSD src repository

  Modified files:
    contrib/isc-dhcp     FREEBSD-upgrade 
    contrib/isc-dhcp/client clparse.c dhclient-script.8 dhclient.8 
                            dhclient.c dhclient.conf.5 
                            dhclient.leases.5 
    contrib/isc-dhcp/client/scripts freebsd 
    contrib/isc-dhcp/common dhcp-options.5 dispatch.c tables.c 
    contrib/isc-dhcp/includes dhcpd.h 
    contrib/isc-dhcp/includes/cf freebsd.h 
  Removed files:
    contrib/isc-dhcp     ANONCVS CHANGES COPYRIGHT 
  Log:
  Resolve conflicts.
  
  Revision  Changes    Path
  1.2       +0 -129    src/contrib/isc-dhcp/ANONCVS (dead)
  1.2       +0 -104    src/contrib/isc-dhcp/CHANGES (dead)
  1.2       +0 -17     src/contrib/isc-dhcp/COPYRIGHT (dead)
  1.20      +3 -3      src/contrib/isc-dhcp/FREEBSD-upgrade
  1.12      +27 -34    src/contrib/isc-dhcp/client/clparse.c
  1.11      +26 -33    src/contrib/isc-dhcp/client/dhclient-script.8
  1.15      +22 -17    src/contrib/isc-dhcp/client/dhclient.8
  1.37      +43 -37    src/contrib/isc-dhcp/client/dhclient.c
  1.14      +25 -32    src/contrib/isc-dhcp/client/dhclient.conf.5
  1.6       +25 -34    src/contrib/isc-dhcp/client/dhclient.leases.5
  1.27      +1 -1      src/contrib/isc-dhcp/client/scripts/freebsd
  1.7       +25 -32    src/contrib/isc-dhcp/common/dhcp-options.5
  1.5       +20 -29    src/contrib/isc-dhcp/common/dispatch.c
  1.11      +20 -29    src/contrib/isc-dhcp/common/tables.c
  1.7       +19 -28    src/contrib/isc-dhcp/includes/cf/freebsd.h
  1.9       +19 -28    src/contrib/isc-dhcp/includes/dhcpd.h