CVSROOT: /cvs Module name: src Changes by: [email protected] 2014/03/12 20:09:34
Modified files:
usr.sbin/nsd : axfr.c config.h.in configure configure.ac
nsd-checkconf.8.in nsd.8.in nsd.conf.5.in
query.c server.c zonec.c
usr.sbin/nsd/compat: snprintf.c
Log message:
merge conflicts
