Module Name:	src
Committed By:	christos
Date:		Thu Dec 22 00:19:00 UTC 2005

Modified Files:
	src/usr.sbin/bind/include: config.h
	src/usr.sbin/bind/include/dns: code.h enumclass.h enumtype.h
	    rdatastruct.h
	src/usr.sbin/bind/include/lwres: platform.h

Log Message:
Resolve conflicts


To generate a diff of this commit:
cvs rdiff -r1.3 -r1.4 src/usr.sbin/bind/include/config.h
cvs rdiff -r1.2 -r1.3 src/usr.sbin/bind/include/dns/code.h \
    src/usr.sbin/bind/include/dns/enumclass.h \
    src/usr.sbin/bind/include/dns/enumtype.h \
    src/usr.sbin/bind/include/dns/rdatastruct.h
cvs rdiff -r1.2 -r1.3 src/usr.sbin/bind/include/lwres/platform.h

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