summaryrefslogtreecommitdiff
path: root/usr.sbin/nsd/xfrd-tcp.c
AgeCommit message (Expand)Author
2015-02-10Merge in a commit from upstream..Brad Smith
2015-02-03merge conflictsBrad Smith
2014-12-25subtraction of two void * is not well defined, plus two void * can be apartOtto Moerbeek
2014-09-16merge conflictsBrad Smith
2014-02-04merge conflictsBrad Smith
2013-11-26merge conflictsStuart Henderson
2012-11-23resolve conflictsStuart Henderson
2012-07-09resolve conflictsStuart Henderson
2011-05-21resolve conflicts and regen configure using autoconf-2.65Jakob Schlyter
2010-08-22mergeJakob Schlyter
2010-01-27merge QID generation patch from NSD trunkJakob Schlyter
2010-01-15NSD v3.2.4Jakob Schlyter