CVS commit: src/dist/bind

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

Module Name:    src
Committed By:   christos
Date:           Sun Nov  7 00:16:59 UTC 2004

Modified Files:
        src/dist/bind: README
        src/dist/bind/bin/dig: dig.c
        src/dist/bind/bin/named: main.c
        src/dist/bind/bin/nsupdate: nsupdate.c
        src/dist/bind/lib/isc/unix: os.c
        src/dist/bind/lib/lwres: getnameinfo.c
Removed Files:
        src/dist/bind/doc/draft: draft-ietf-dnsext-dhcid-rr-07.txt
            draft-ietf-dnsext-dns-threats-06.txt
            draft-ietf-dnsext-dnssec-intro-09.txt
            draft-ietf-dnsext-dnssec-protocol-05.txt
            draft-ietf-dnsext-dnssec-records-07.txt
            draft-ietf-dnsext-mdns-29.txt draft-ietf-dnsext-nsec-rdata-05.txt
            draft-ietf-dnsop-dnssec-operational-practices-00.txt
            draft-ietf-dnsop-ipv6-dns-issues-04.txt
            draft-ietf-dnsop-key-rollover-requirements-00.txt

Log Message:
Resolve conflicts


To generate a diff of this commit:
cvs rdiff -r1.11 -r1.12 src/dist/bind/README
cvs rdiff -r1.9 -r1.10 src/dist/bind/bin/dig/dig.c
cvs rdiff -r1.2 -r1.3 src/dist/bind/bin/named/main.c
cvs rdiff -r1.8 -r1.9 src/dist/bind/bin/nsupdate/nsupdate.c
cvs rdiff -r1.1.1.1 -r0 \
    src/dist/bind/doc/draft/draft-ietf-dnsext-dhcid-rr-07.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-dns-threats-06.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-dnssec-intro-09.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-dnssec-protocol-05.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-dnssec-records-07.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-mdns-29.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsext-nsec-rdata-05.txt \
    
src/dist/bind/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-00.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-04.txt \
    src/dist/bind/doc/draft/draft-ietf-dnsop-key-rollover-requirements-00.txt
cvs rdiff -r1.2 -r1.3 src/dist/bind/lib/isc/unix/os.c
cvs rdiff -r1.2 -r1.3 src/dist/bind/lib/lwres/getnameinfo.c

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