CVSROOT: /cvs Module name: src Changes by: st...@cvs.openbsd.org 2015/07/17 11:36:33
Modified files:
usr.sbin/nsd : Makefile.in axfr.c config.h.in configparser.y
configure configure.ac difffile.c dname.c
namedb.c namedb.h nsd-checkconf.8.in
nsd-checkconf.c nsd-control.8.in nsd.c
nsd.conf.5.in query.c rdata.c
region-allocator.c remote.c rrl.c server.c
udb.c util.c util.h zonec.c zparser.y
usr.sbin/nsd/compat: b64_pton.c
Log message:
merge conflicts
