CVS commit: src/external/bsd/bind

["Christos Zoulas" <christos%netbsd.org@localhost>]

Module Name:    src
Committed By:   christos
Date:           Thu Dec 17 04:00:22 UTC 2015

Modified Files:
        src/external/bsd/bind: bind2netbsd
        src/external/bsd/bind/include: config.h
        src/external/bsd/bind/include/isc: platform.h
        src/external/bsd/bind/include/lwres: platform.h
        src/external/bsd/bind/lib/libbind9: shlib_version
        src/external/bsd/bind/lib/libdns: shlib_version
        src/external/bsd/bind/lib/libirs: shlib_version
        src/external/bsd/bind/lib/libisc: shlib_version
        src/external/bsd/bind/lib/libisccc: shlib_version
        src/external/bsd/bind/lib/libisccfg: shlib_version
        src/external/bsd/bind/lib/liblwres: shlib_version

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/bind/bind2netbsd
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/bind/include/config.h
cvs rdiff -u -r1.19 -r1.20 src/external/bsd/bind/include/isc/platform.h
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/bind/include/lwres/platform.h
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/bind/lib/libbind9/shlib_version
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/bind/lib/libdns/shlib_version
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/bind/lib/libirs/shlib_version
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/bind/lib/libisc/shlib_version
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/bind/lib/libisccc/shlib_version
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/bind/lib/libisccfg/shlib_version
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/bind/lib/liblwres/shlib_version

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.