CVSROOT: /cvs Module name: src Changes by: b...@cvs.openbsd.org 2014/11/19 17:11:14
Modified files: usr.sbin/unbound: Makefile.in configure configure.ac usr.sbin/unbound/daemon: remote.c remote.h unbound.c worker.c worker.h usr.sbin/unbound/doc: Changelog unbound-host.1.in unbound.8.in usr.sbin/unbound/iterator: iter_hints.c usr.sbin/unbound/libunbound: libworker.c usr.sbin/unbound/services: listen_dnsport.c listen_dnsport.h usr.sbin/unbound/smallapp: worker_cb.c usr.sbin/unbound/util: config_file.c fptr_wlist.c fptr_wlist.h netevent.c netevent.h random.c Log message: merge conflicts