Module Name:	basesrc
Committed By:	itojun
Date:		Fri Aug 27 16:07:26 UTC 1999

Modified Files:
	basesrc/usr.sbin/tcpdchk: Makefile inetcf.c scaffold.c tcpdchk.c

Log Message:
conflict resolution after tcp_wrappers upgrade to 7.6.


To generate a diff of this commit:
cvs rdiff -r1.8 -r1.9 basesrc/usr.sbin/tcpdchk/Makefile
cvs rdiff -r1.4 -r1.5 basesrc/usr.sbin/tcpdchk/inetcf.c
cvs rdiff -r1.5 -r1.6 basesrc/usr.sbin/tcpdchk/scaffold.c
cvs rdiff -r1.7 -r1.8 basesrc/usr.sbin/tcpdchk/tcpdchk.c

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