From owner-cvs-all  Thu Feb 11 04:49:42 1999
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Received: (from majordom@localhost)
          by hub.freebsd.org (8.8.8/8.8.8) id EAA11034
          for cvs-all-outgoing; Thu, 11 Feb 1999 04:49:42 -0800 (PST)
          (envelope-from owner-cvs-all@FreeBSD.ORG)
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
          by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id EAA11029;
          Thu, 11 Feb 1999 04:49:41 -0800 (PST)
          (envelope-from obrien@FreeBSD.org)
From: "David E. O'Brien" <obrien@FreeBSD.ORG>
Received: (from obrien@localhost)
	by freefall.freebsd.org (8.9.2/8.9.2) id EAA24992;
	Thu, 11 Feb 1999 04:49:40 -0800 (PST)
	(envelope-from obrien@FreeBSD.org)
Date: Thu, 11 Feb 1999 04:49:40 -0800 (PST)
Message-Id: <199902111249.EAA24992@freefall.freebsd.org>
To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG
Subject: cvs commit: src/contrib/isc-dhcp/client clparse.c dhclient.c
         src/contrib/isc-dhcp/includes/cf freebsd.h
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk

obrien      1999/02/11 04:49:40 PST

  Modified files:
    contrib/isc-dhcp/client clparse.c dhclient.c 
    contrib/isc-dhcp/includes/cf freebsd.h 
  Log:
  fix conflicts
  
  Revision  Changes    Path
  1.3       +13 -11    src/contrib/isc-dhcp/client/clparse.c
  1.3       +106 -37   src/contrib/isc-dhcp/client/dhclient.c
  1.3       +4 -4      src/contrib/isc-dhcp/includes/cf/freebsd.h

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