Module Name:	src
Committed By:	christos
Date:		Wed Dec 21 22:34:32 UTC 2005

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/dns: rbt.c validator.c
	src/dist/bind/lib/dns/rdata/in_1: wks_11.c
	src/dist/bind/lib/isc: assertions.c base64.c heap.c hex.c string.c
	src/dist/bind/lib/isc/unix: app.c os.c
	src/dist/bind/lib/lwres: getaddrinfo.c getnameinfo.c
Removed Files:
	src/dist/bind/lib/dns/rdata/generic: dlv_65323.c dlv_65323.h
	    dnskey_48.c dnskey_48.h ds_43.c ds_43.h nsec_47.c nsec_47.h
	    rrsig_46.c rrsig_46.h sshfp_44.c sshfp_44.h
	src/dist/bind/lib/dns/rdata/in_1: apl_42.c apl_42.h

Log Message:
Resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.12 -r1.13 src/dist/bind/README
cvs rdiff -r1.10 -r1.11 src/dist/bind/bin/dig/dig.c
cvs rdiff -r1.3 -r1.4 src/dist/bind/bin/named/main.c
cvs rdiff -r1.9 -r1.10 src/dist/bind/bin/nsupdate/nsupdate.c
cvs rdiff -r1.2 -r1.3 src/dist/bind/lib/dns/rbt.c \
    src/dist/bind/lib/dns/validator.c
cvs rdiff -r1.1.1.1 -r0 src/dist/bind/lib/dns/rdata/generic/dlv_65323.c \
    src/dist/bind/lib/dns/rdata/generic/dlv_65323.h \
    src/dist/bind/lib/dns/rdata/generic/dnskey_48.c \
    src/dist/bind/lib/dns/rdata/generic/dnskey_48.h \
    src/dist/bind/lib/dns/rdata/generic/ds_43.c \
    src/dist/bind/lib/dns/rdata/generic/ds_43.h \
    src/dist/bind/lib/dns/rdata/generic/nsec_47.c \
    src/dist/bind/lib/dns/rdata/generic/nsec_47.h \
    src/dist/bind/lib/dns/rdata/generic/rrsig_46.h \
    src/dist/bind/lib/dns/rdata/generic/sshfp_44.c \
    src/dist/bind/lib/dns/rdata/generic/sshfp_44.h
cvs rdiff -r1.1.1.2 -r0 src/dist/bind/lib/dns/rdata/generic/rrsig_46.c
cvs rdiff -r1.1.1.1 -r0 src/dist/bind/lib/dns/rdata/in_1/apl_42.c \
    src/dist/bind/lib/dns/rdata/in_1/apl_42.h
cvs rdiff -r1.2 -r1.3 src/dist/bind/lib/dns/rdata/in_1/wks_11.c
cvs rdiff -r1.3 -r1.4 src/dist/bind/lib/isc/assertions.c
cvs rdiff -r1.2 -r1.3 src/dist/bind/lib/isc/base64.c \
    src/dist/bind/lib/isc/heap.c src/dist/bind/lib/isc/hex.c \
    src/dist/bind/lib/isc/string.c
cvs rdiff -r1.2 -r1.3 src/dist/bind/lib/isc/unix/app.c
cvs rdiff -r1.3 -r1.4 src/dist/bind/lib/isc/unix/os.c
cvs rdiff -r1.2 -r1.3 src/dist/bind/lib/lwres/getaddrinfo.c
cvs rdiff -r1.3 -r1.4 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.