Module Name:	src
Committed By:	christos
Date:		Tue May 18 00:10:39 UTC 2004

Modified Files:
	src/usr.sbin/bind: Makefile Makefile.inc
	src/usr.sbin/bind/dig: Makefile
	src/usr.sbin/bind/host: Makefile
	src/usr.sbin/bind/named: Makefile
	src/usr.sbin/bind/nslookup: Makefile
	src/usr.sbin/bind/nsupdate: Makefile
Removed Files:
	src/usr.sbin/bind/dnsquery: Makefile
	src/usr.sbin/bind/lib: Makefile
	src/usr.sbin/bind/man: named.reload.8 named.restart.8
	src/usr.sbin/bind/named-xfer: Makefile
	src/usr.sbin/bind/ndc: Makefile
	src/usr.sbin/bind/reload: Makefile named.reload.sh
	src/usr.sbin/bind/restart: Makefile named.restart.sh

Log Message:
Resolve conflicts


To generate a diff of this commit:
cvs rdiff -r1.10 -r1.11 src/usr.sbin/bind/Makefile
cvs rdiff -r1.15 -r1.16 src/usr.sbin/bind/Makefile.inc
cvs rdiff -r1.3 -r1.4 src/usr.sbin/bind/dig/Makefile
cvs rdiff -r1.3 -r0 src/usr.sbin/bind/dnsquery/Makefile
cvs rdiff -r1.4 -r1.5 src/usr.sbin/bind/host/Makefile
cvs rdiff -r1.24 -r0 src/usr.sbin/bind/lib/Makefile
cvs rdiff -r1.3 -r0 src/usr.sbin/bind/man/named.reload.8 \
    src/usr.sbin/bind/man/named.restart.8
cvs rdiff -r1.15 -r1.16 src/usr.sbin/bind/named/Makefile
cvs rdiff -r1.12 -r0 src/usr.sbin/bind/named-xfer/Makefile
cvs rdiff -r1.6 -r0 src/usr.sbin/bind/ndc/Makefile
cvs rdiff -r1.6 -r1.7 src/usr.sbin/bind/nslookup/Makefile
cvs rdiff -r1.4 -r1.5 src/usr.sbin/bind/nsupdate/Makefile
cvs rdiff -r1.4 -r0 src/usr.sbin/bind/reload/Makefile
cvs rdiff -r1.3 -r0 src/usr.sbin/bind/reload/named.reload.sh
cvs rdiff -r1.4 -r0 src/usr.sbin/bind/restart/Makefile
cvs rdiff -r1.3 -r0 src/usr.sbin/bind/restart/named.restart.sh

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