summaryrefslogtreecommitdiff
path: root/usr.sbin/nsd/util.h
AgeCommit message (Expand)Author
2015-07-17merge conflictsStuart Henderson
2014-09-16merge conflictsBrad Smith
2013-11-26merge conflictsStuart Henderson
2012-07-09resolve conflictsStuart Henderson
2011-05-21resolve conflicts and regen configure using autoconf-2.65Jakob Schlyter
2010-04-15resolve conflicts from import of v3.2.5Jakob Schlyter
2010-01-27merge QID generation patch from NSD trunkJakob Schlyter
2010-01-15NSD v3.2.4Jakob Schlyter