CVSROOT: /cvs Module name: src Changes by: [email protected] 2012/08/23 16:59:48
Modified files:
usr.sbin/unbound: Makefile.in configure configure.ac
usr.sbin/unbound/daemon: remote.c remote.h unbound.c
usr.sbin/unbound/doc: Changelog unbound-host.1
usr.sbin/unbound/libunbound: libworker.c
usr.sbin/unbound/services: listen_dnsport.c
usr.sbin/unbound/util: netevent.c
Log message:
resolve conflicts
