From owner-cvs-all  Sun Mar 21 17:29:58 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 66CA715161; Sun, 21 Mar 1999 17:29:57 -0800 (PST)
	(envelope-from obrien@FreeBSD.org)
Received: (from obrien@localhost)
	by freefall.freebsd.org (8.9.2/8.9.2) id RAA37988;
	Sun, 21 Mar 1999 17:29:39 -0800 (PST)
	(envelope-from obrien@FreeBSD.org)
Message-Id: <199903220129.RAA37988@freefall.freebsd.org>
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Sun, 21 Mar 1999 17:29:39 -0800 (PST)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/contrib/isc-dhcp/client dhclient.8 dhclient.c
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk

obrien      1999/03/21 17:29:39 PST

  Modified files:
    contrib/isc-dhcp/client dhclient.8 dhclient.c 
  Log:
  fix conflicts.
  
  Revision  Changes    Path
  1.5       +12 -0     src/contrib/isc-dhcp/client/dhclient.8
  1.5       +2 -2      src/contrib/isc-dhcp/client/dhclient.c


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