summaryrefslogtreecommitdiff
path: root/usr.sbin/nsd/server.c
AgeCommit message (Expand)Author
2012-11-23resolve conflictsStuart Henderson
2012-08-28resolve conflictsStuart Henderson
2012-07-09resolve conflictsStuart Henderson
2012-01-29resolve conflictsJakob Schlyter
2011-05-21resolve conflicts and regen configure using autoconf-2.65Jakob Schlyter
2011-01-27upgrade to NSD 3.2.7; ok sthen@, tested by multiple peopleJakob Schlyter
2010-01-15NSD v3.2.4Jakob Schlyter