David E. O'Brien 40c963099f Clean up conflicts.		1999-06-24 04:38:03 +00:00
..
scripts	Fix conflicts.	1999-05-02 09:24:16 +00:00
clparse.c	Fix conflicts.	1999-05-02 09:24:16 +00:00
dhclient-script.8	Fix conflicts.	1999-05-02 09:24:16 +00:00
dhclient.8	Document the "-D" option (UTSL).	1999-04-14 05:37:54 +00:00
dhclient.c	Clean up conflicts.	1999-06-24 04:38:03 +00:00
dhclient.conf	use /sbin/dhclient-script rather than /etc/dhclient-script	1999-02-10 09:35:26 +00:00
dhclient.conf.5	Fix typo which causes an unnecessary line break.	1999-05-29 13:02:00 +00:00
dhclient.leases.5	* fix paths in manpages	1999-02-10 21:02:32 +00:00