Module Name: src
Committed By: christos
Date: Tue Oct 4 23:46:01 UTC 2016
Modified Files:
src/external/bsd/bind/dist: CHANGES README srcid version
src/external/bsd/bind/dist/bin/named: lwdgrbn.c
src/external/bsd/bind/dist/bin/pkcs11: pkcs11-destroy.8 pkcs11-keygen.8
pkcs11-list.8
src/external/bsd/bind/dist/bin/tests/system/lwresd: lwtest.c
src/external/bsd/bind/dist/doc/arm: Bv9ARM.ch04.html Bv9ARM.ch06.html
Bv9ARM.ch07.html Bv9ARM.ch08.html Bv9ARM.ch09.html Bv9ARM.html
Bv9ARM.pdf man.arpaname.html man.ddns-confgen.html man.delv.html
man.dig.html man.dnssec-checkds.html man.dnssec-coverage.html
man.dnssec-dsfromkey.html man.dnssec-importkey.html
man.dnssec-keyfromlabel.html man.dnssec-keygen.html
man.dnssec-revoke.html man.dnssec-settime.html
man.dnssec-signzone.html man.dnssec-verify.html man.genrandom.html
man.host.html man.isc-hmac-fixup.html man.named-checkconf.html
man.named-checkzone.html man.named-journalprint.html
man.named-rrchecker.html man.named.html man.nsec3hash.html
man.nsupdate.html man.rndc-confgen.html man.rndc.conf.html
man.rndc.html
src/external/bsd/bind/dist/lib/dns: api message.c nsec3.c rbtdb.c
src/external/bsd/bind/dist/lib/dns/rdata/generic: opt_41.c
src/external/bsd/bind/dist/lib/dns/tests: rdata_test.c
Log Message:
Merge conflicts.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/external/bsd/bind/dist/CHANGES
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/bind/dist/README
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/bind/dist/srcid
cvs rdiff -u -r1.19 -r1.20 src/external/bsd/bind/dist/version
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/bind/dist/bin/named/lwdgrbn.c
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/bind/dist/bin/pkcs11/pkcs11-destroy.8 \
src/external/bsd/bind/dist/bin/pkcs11/pkcs11-keygen.8
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/bind/dist/bin/pkcs11/pkcs11-list.8
cvs rdiff -u -r1.8 -r1.9 \
src/external/bsd/bind/dist/bin/tests/system/lwresd/lwtest.c
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.html \
src/external/bsd/bind/dist/doc/arm/man.arpaname.html \
src/external/bsd/bind/dist/doc/arm/man.ddns-confgen.html \
src/external/bsd/bind/dist/doc/arm/man.delv.html \
src/external/bsd/bind/dist/doc/arm/man.dig.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-revoke.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-settime.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-signzone.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-verify.html \
src/external/bsd/bind/dist/doc/arm/man.genrandom.html \
src/external/bsd/bind/dist/doc/arm/man.host.html \
src/external/bsd/bind/dist/doc/arm/man.isc-hmac-fixup.html \
src/external/bsd/bind/dist/doc/arm/man.named-checkconf.html \
src/external/bsd/bind/dist/doc/arm/man.named-checkzone.html \
src/external/bsd/bind/dist/doc/arm/man.named-journalprint.html \
src/external/bsd/bind/dist/doc/arm/man.named-rrchecker.html \
src/external/bsd/bind/dist/doc/arm/man.named.html \
src/external/bsd/bind/dist/doc/arm/man.nsec3hash.html \
src/external/bsd/bind/dist/doc/arm/man.nsupdate.html \
src/external/bsd/bind/dist/doc/arm/man.rndc-confgen.html \
src/external/bsd/bind/dist/doc/arm/man.rndc.conf.html \
src/external/bsd/bind/dist/doc/arm/man.rndc.html
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/bind/dist/doc/arm/Bv9ARM.pdf
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/bind/dist/lib/dns/api
cvs rdiff -u -r1.19 -r1.20 src/external/bsd/bind/dist/lib/dns/message.c
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/bind/dist/lib/dns/nsec3.c
cvs rdiff -u -r1.22 -r1.23 src/external/bsd/bind/dist/lib/dns/rbtdb.c
cvs rdiff -u -r1.10 -r1.11 \
src/external/bsd/bind/dist/lib/dns/rdata/generic/opt_41.c
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/bind/dist/lib/dns/tests/rdata_test.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
