Date: Wed, 15 Jan 2003 02:47:32 -0800 (PST) From: Murray Stokely <murray@FreeBSD.org> To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/contrib/isc-dhcp/client dhclient-script.8 dhclient.8 dhclient.conf.5 dhclient.leases.5 src/contrib/isc-dhcp/client/scripts freebsd Message-ID: <200301151047.h0FAlW7f019671@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
murray 2003/01/15 02:47:32 PST
Modified files:
contrib/isc-dhcp/client dhclient-script.8 dhclient.8
dhclient.conf.5 dhclient.leases.5
contrib/isc-dhcp/client/scripts freebsd
Log:
Resolve conflicts.
Revision Changes Path
1.9 +1 -0 src/contrib/isc-dhcp/client/dhclient-script.8
1.11 +1 -1 src/contrib/isc-dhcp/client/dhclient.8
1.11 +6 -5 src/contrib/isc-dhcp/client/dhclient.conf.5
1.4 +1 -0 src/contrib/isc-dhcp/client/dhclient.leases.5
1.21 +9 -3 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?200301151047.h0FAlW7f019671>