Date: Sun, 2 May 1999 02:24:18 -0700 (PDT) From: "David E. O'Brien" <obrien@FreeBSD.org> 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 Message-ID: <199905020924.CAA82624@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199905020924.CAA82624>