CVSROOT: /cvs Module name: src Changes by: st...@cvs.openbsd.org 2012/11/23 13:30:26
Modified files:
usr.sbin/nsd : axfr.c config.h.in configure configure.ac
dname.c dns.h nsd-checkconf.8.in
nsd-notify.8.in nsd-notify.c nsd-patch.8.in
nsd-patch.c nsd-xfer.8.in nsd-xfer.c nsd.8.in
nsd.c nsd.conf.5.in nsdc.8.in nsec3.c query.c
server.c xfrd-tcp.c zonec.8.in zonec.c
Log message:
resolve conflicts
