christos bd58506612 Resolve conflicts		2005-12-22 00:19:00 +00:00
..
dns	Resolve conflicts	2005-12-22 00:19:00 +00:00
isc	We control threaded or not from the Makefile	2004-11-07 02:54:55 +00:00
lwres	Resolve conflicts	2005-12-22 00:19:00 +00:00
config.h	Resolve conflicts	2005-12-22 00:19:00 +00:00