CVSROOT: /cvs Module name: src Changes by: st...@cvs.openbsd.org 2013/02/18 03:18:39
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-checkconf.c
nsd-notify.8.in nsd-patch.8.in nsd-xfer.8.in
nsd-xfer.c nsd.8.in nsd.c nsd.conf.5.in
nsdc.8.in nsec3.c query.c rdata.c
region-allocator.c server.c util.c zonec.8.in
zonec.c zonec.h zparser.y
Log message:
resolve conflicts
