CVSROOT: /cvs
Module name: src
Changes by: st...@cvs.openbsd.org 2015/02/17 03:03:59
Modified files:
usr.sbin/unbound: Makefile.in configure configure.ac
usr.sbin/unbound/daemon: remote.c remote.h unbound.c worker.c
usr.sbin/unbound/doc: Changelog README example.conf.in
libunbound.3.in unbound-anchor.8.in
unbound-checkconf.8.in
unbound-control.8.in unbound-host.1.in
unbound.conf.5.in
usr.sbin/unbound/iterator: iterator.c
usr.sbin/unbound/libunbound: libworker.c
usr.sbin/unbound/services: listen_dnsport.c listen_dnsport.h
usr.sbin/unbound/util: config_file.c net_help.c
Log message:
merge conflicts
