CVSROOT: /cvs Module name: src Changes by: ja...@cvs.openbsd.org 2012/01/29 04:23:24
Modified files:
usr.sbin/nsd : config.h.in configure.ac dname.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
nsdc.sh.in nsec3.c query.c rdata.c server.c
zonec.8.in zonec.c
Log message:
resolve conflicts
