CVSROOT: /cvs Module name: src Changes by: b...@cvs.openbsd.org 2014/02/03 20:07:25
Modified files:
usr.sbin/nsd : Makefile.in axfr.c config.h.in configparser.y
configure configure.ac dns.c dns.h
nsd-checkconf.8.in nsd.8.in nsd.c nsd.conf.5.in
rdata.c server.c util.c xfrd-disk.c xfrd-tcp.c
xfrd.c zonec.c zonec.h zparser.y
Log message:
merge conflicts
