source-changes: CVS commit: src/dist/bind

Subject: CVS commit: src/dist/bind
To: None <source-changes@netbsd.org>
From: Jun-ichiro itojun Hagino <itojun@netbsd.org>
List: source-changes
Date: 06/09/2003 13:19:34

Module Name:	src
Committed By:	itojun
Date:		Mon Jun  9 13:19:34 UTC 2003

Modified Files:
	src/dist/bind: README Version
	src/dist/bind/bin/named: ns_main.c
	src/dist/bind/lib/irs: gethostent.c
	src/dist/bind/lib/resolv: res_debug.c

Log Message:
resolve conflicts


To generate a diff of this commit:
cvs rdiff -r1.8 -r1.9 src/dist/bind/README
cvs rdiff -r1.4 -r1.5 src/dist/bind/Version
cvs rdiff -r1.14 -r1.15 src/dist/bind/bin/named/ns_main.c
cvs rdiff -r1.5 -r1.6 src/dist/bind/lib/irs/gethostent.c
cvs rdiff -r1.6 -r1.7 src/dist/bind/lib/resolv/res_debug.c

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