Martin Blapp fb26c675fb Resolve conflicts.

2003-09-02 11:13:21 +00:00

..

arpa

Import ISC DHCP 3.0.1 RC6 client.

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

cf

Tweak a couple of utilities so they compile cleanly for /rescue. Mostly

2003-06-29 18:46:18 +00:00

isc-dhcp

Import ISC DHCP 3.0.1 RC6 client.

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

minires

Import ISC DHCP 3.0.1 RC8 client.

2002-04-01 07:54:44 +00:00

netinet

Import ISC DHCP 3.0.1 RC6 client.

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

omapip

Import ISC DHCP 3.0.1 RC6 client.

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

cdefs.h

Import ISC DHCP 3.0.1 RC6 client.

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

ctrace.h

Import ISC DHCP 3.0.1 RC6 client.

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

dhcp.h

Import ISC DHCP 3.0.1 RC6 client.

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

dhcpd.h

Resolve conflicts.

2003-09-02 11:13:21 +00:00

dhctoken.h

Import ISC DHCP 3.0.1 RC8 client.

2002-04-01 07:54:44 +00:00

failover.h

Import ISC DHCP 3.0.1 RC6 client.

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

hash.h

…

inet.h

Import ISC DHCP 3.0.1 RC6 client.

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

osdep.h

Import ISC DHCP 3.0.1 RC10 client.

2003-01-15 10:31:26 +00:00

site.h

Import ISC DHCP 3.0.1 RC9 client.

2002-09-30 08:39:27 +00:00

statement.h

Import ISC DHCP 3.0.1 RC6 client.

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

sysconf.h

…

tree.h

Import ISC DHCP 3.0.1 RC6 client.

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

version.h

Import ISC DHCP 3.0.1 RC12 client.

2003-09-02 11:01:27 +00:00