From owner-cvs-all  Sun May  2  2:24:20 1999
Delivered-To: cvs-all@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
	by hub.freebsd.org (Postfix) with ESMTP
	id B024814D9D; Sun,  2 May 1999 02:24:18 -0700 (PDT)
	(envelope-from obrien@FreeBSD.org)
Received: (from obrien@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id CAA82624;
	Sun, 2 May 1999 02:24:18 -0700 (PDT)
	(envelope-from obrien@FreeBSD.org)
Message-Id: <199905020924.CAA82624@freefall.freebsd.org>
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Sun, 2 May 1999 02:24:18 -0700 (PDT)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/contrib/isc-dhcp FREEBSD-upgrade src/contrib/isc-dhcp/client
         clparse.c dhclient-script.8 dhclient.c dhclient.conf.5
         src/contrib/isc-dhcp/client/scripts freebsd
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk

obrien      1999/05/02 02:24:17 PDT

  Modified files:
    contrib/isc-dhcp     FREEBSD-upgrade 
    contrib/isc-dhcp/client clparse.c dhclient-script.8 dhclient.c 
                            dhclient.conf.5 
    contrib/isc-dhcp/client/scripts freebsd 
  Log:
  Fix conflicts.
  
  Revision  Changes    Path
  1.6       +10 -9     src/contrib/isc-dhcp/FREEBSD-upgrade
  1.4       +4 -23     src/contrib/isc-dhcp/client/clparse.c
  1.4       +45 -11    src/contrib/isc-dhcp/client/dhclient-script.8
  1.7       +87 -44    src/contrib/isc-dhcp/client/dhclient.c
  1.4       +9 -7      src/contrib/isc-dhcp/client/dhclient.conf.5
  1.3       +36 -8     src/contrib/isc-dhcp/client/scripts/freebsd


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