christos 88ae7d9d8f Resolve conflicts.		2004-11-07 01:48:01 +00:00
..
ftp.h	…
inet.h	Resolve conflicts.	2004-11-07 01:48:01 +00:00
nameser.h	resolve conflicts.	2004-05-21 02:25:10 +00:00
nameser_compat.h	Re-import these. I imported the old ones accidentally.	2004-11-07 01:28:27 +00:00
telnet.h	…
tftp.h	…