christos b74cd7536f resolve conflicts.

2004-05-21 02:25:10 +00:00

..

ftp.h

…

inet.h

add 2 new functions from bind9

2004-05-21 01:53:17 +00:00

nameser_compat.h

import new and changed files from bind9

2004-05-21 02:17:49 +00:00

nameser.h

resolve conflicts.

2004-05-21 02:25:10 +00:00

telnet.h

…

tftp.h

…