summaryrefslogtreecommitdiff
path: root/usr.sbin/nsd/dns.h
AgeCommit message (Expand)Author
2014-02-04merge conflictsBrad Smith
2013-11-26merge conflictsStuart Henderson
2013-09-03merge NSD 3.2.16Stuart Henderson
2013-02-18resolve conflictsStuart Henderson
2012-11-23resolve 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