Martin Blapp fb26c675fb Resolve conflicts.

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

..

alloc.c

Import isc-dhcpd-3.0.1rc11.

2003-01-16 07:04:57 +00:00

bpf.c

Import isc-dhcpd-3.0.1rc11.

2003-01-16 07:04:57 +00:00

comapi.c

Import isc-dhcpd-3.0.1rc11.

2003-01-16 07:04:57 +00:00

conflex.c

Import isc-dhcpd-3.0.1rc11.

2003-01-16 07:04:57 +00:00

convert.c

…

ctrace.c

Import isc-dhcpd-3.0.1rc11.

2003-01-16 07:04:57 +00:00

dhcp-eval.5

Import isc-dhcpd-3.0.1rc11.

2003-01-16 07:04:57 +00:00

dhcp-options.5

Resolve conflicts.

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

discover.c

Import ISC DHCP 3.0.1 RC12 client.

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

dispatch.c

Change name of state_link() to state_polling() to make it

2003-08-10 22:01:37 +00:00

dlpi.c

Import isc-dhcpd-3.0.1rc11.

2003-01-16 07:04:57 +00:00

dns.c

Import isc-dhcpd-3.0.1rc11.

2003-01-16 07:04:57 +00:00

errwarn.c

…

ethernet.c

Import isc-dhcpd-3.0.1rc11.

2003-01-16 07:04:57 +00:00

execute.c

Import isc-dhcpd-3.0.1rc11.

2003-01-16 07:04:57 +00:00

fddi.c

Import isc-dhcpd-3.0.1rc11.

2003-01-16 07:04:57 +00:00

hash.c

…

icmp.c

Import isc-dhcpd-3.0.1rc11.

2003-01-16 07:04:57 +00:00

inet_addr.c

…

inet.c

Import isc-dhcpd-3.0.1rc11.

2003-01-16 07:04:57 +00:00

lpf.c

Import isc-dhcpd-3.0.1rc11.

2003-01-16 07:04:57 +00:00

Makefile.dist

Import ISC DHCP 3.0.1 RC6 client.

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

memory.c

Import isc-dhcpd-3.0.1rc11.

2003-01-16 07:04:57 +00:00

nit.c

Import isc-dhcpd-3.0.1rc11.

2003-01-16 07:04:57 +00:00

options.c

Import ISC DHCP 3.0.1 RC12 client.

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

packet.c

Import isc-dhcpd-3.0.1rc11.

2003-01-16 07:04:57 +00:00

parse.c

Import ISC DHCP 3.0.1 RC12 client.

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

print.c

Import ISC DHCP 3.0.1 RC12 client.

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

raw.c

Import isc-dhcpd-3.0.1rc11.

2003-01-16 07:04:57 +00:00

resolv.c

Import isc-dhcpd-3.0.1rc11.

2003-01-16 07:04:57 +00:00

socket.c

Import isc-dhcpd-3.0.1rc11.

2003-01-16 07:04:57 +00:00

tables.c

Resolve conflicts.

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

tr.c

Import isc-dhcpd-3.0.1rc11.

2003-01-16 07:04:57 +00:00

tree.c

Import isc-dhcpd-3.0.1rc11.

2003-01-16 07:04:57 +00:00

upf.c

Import isc-dhcpd-3.0.1rc11.

2003-01-16 07:04:57 +00:00