CVSROOT: /cvs Module name: src Changes by: st...@cvs.openbsd.org 2012/07/09 15:56:41
Modified files:
usr.sbin/nsd : Makefile.in axfr.c config.h.in configparser.y
configure configure.ac dname.c dns.c dns.h
nsd-checkconf.8.in nsd-checkconf.c
nsd-notify.8.in nsd-patch.8.in nsd-xfer.8.in
nsd.8.in nsd.c nsd.conf.5.in nsdc.8.in query.c
rdata.c region-allocator.c server.c util.c
util.h xfrd-tcp.c zonec.8.in zparser.y
Log message:
resolve conflicts
