Murray Stokely 41156c80b5 Resolve conflicts.

2002-04-01 08:09:50 +00:00

..

scripts

Resolve conflicts.

2002-02-19 12:10:40 +00:00

clparse.c

Resolve conflicts:

2002-04-01 07:59:50 +00:00

dhclient-script.8

Resolve conflicts :

2002-02-19 11:57:47 +00:00

dhclient.8

Resolve conflicts :

2002-02-19 12:00:47 +00:00

dhclient.c

Resolve conflicts:

2002-04-01 08:02:18 +00:00

dhclient.conf

use /sbin/dhclient-script rather than /etc/dhclient-script

1999-02-10 09:35:26 +00:00

dhclient.conf.5

Resolve conflicts.

2002-04-01 08:09:50 +00:00

dhclient.leases.5

Resolve conflicts. Remove references to dhcpd from the man page,

2002-02-19 12:43:18 +00:00

Makefile.dist

Import ISC DHCP 3.0.1 RC6 client.

2002-02-19 11:04:34 +00:00