source-changes: NetBSD master CVS tree commits

Subject: NetBSD master CVS tree commits
To: None <source-changes@NetBSD.ORG>
From: None <source@NetBSD.ORG>
List: source-changes
Date: 07/05/1997 05:50:02

darrenr
Fri Jul  4 22:43:38 PDT 1997
Update of /cvsroot/src/usr.sbin/ipf/ipf
In directory netbsd1:/home/darrenr/src/usr.sbin/ipf/ipf

Modified Files:
	Makefile ipf.c parse.c 
Log Message:
fix conflicts from import


darrenr
Fri Jul  4 22:43:43 PDT 1997
Update of /cvsroot/src/usr.sbin/ipf/ipfstat
In directory netbsd1:/home/darrenr/src/usr.sbin/ipf/ipfstat

Modified Files:
	Makefile fils.c 
Log Message:
fix conflicts from import


darrenr
Fri Jul  4 22:43:48 PDT 1997
Update of /cvsroot/src/usr.sbin/ipf/ipftest
In directory netbsd1:/home/darrenr/src/usr.sbin/ipf/ipftest

Modified Files:
	Makefile ipt.c 
Log Message:
fix conflicts from import


darrenr
Fri Jul  4 22:43:54 PDT 1997
Update of /cvsroot/src/usr.sbin/ipf/ipmon
In directory netbsd1:/home/darrenr/src/usr.sbin/ipf/ipmon

Modified Files:
	Makefile ipmon.c 
Log Message:
fix conflicts from import


darrenr
Fri Jul  4 22:43:59 PDT 1997
Update of /cvsroot/src/usr.sbin/ipf/ipnat
In directory netbsd1:/home/darrenr/src/usr.sbin/ipf/ipnat

Modified Files:
	Makefile ipnat.c 
Log Message:
fix conflicts from import


darrenr
Fri Jul  4 22:44:07 PDT 1997
Update of /cvsroot/src/usr.sbin/ipf/ipresend
In directory netbsd1:/home/darrenr/src/usr.sbin/ipf/ipresend

Modified Files:
	Makefile 
Log Message:
fix conflicts from import


darrenr
Fri Jul  4 22:44:11 PDT 1997
Update of /cvsroot/src/usr.sbin/ipf/ipsend
In directory netbsd1:/home/darrenr/src/usr.sbin/ipf/ipsend

Modified Files:
	Makefile 
Log Message:
fix conflicts from import


darrenr
Fri Jul  4 22:44:14 PDT 1997
Update of /cvsroot/src/usr.sbin/ipf/iptest
In directory netbsd1:/home/darrenr/src/usr.sbin/ipf/iptest

Modified Files:
	Makefile 
Log Message:
fix conflicts from import