CVSROOT: /cvs Module name: src Changes by: b...@cvs.openbsd.org 2015/02/03 03:40:02
Modified files:
usr.sbin/nsd : axfr.c config.h.in configparser.y configure
configure.ac difffile.c dname.c namedb.h
nsd-checkconf.8.in nsd-checkconf.c
nsd-control.8.in nsd.8.in nsd.c nsd.conf.5.in
query.c remote.c server.c util.c xfrd-disk.c
xfrd-tcp.c xfrd.c xfrd.h zonec.c
usr.sbin/nsd/compat: b64_pton.c strptime.c
Log message:
merge conflicts
