darrenr
Sun May 25 05:04:56 PDT 1997
Update of /cvsroot/src/usr.sbin/ipf/ipf
In directory netbsd1:/home/darrenr/src/ipfilter/src/usr.sbin/ipf/src/usr.sbin/ipf/ipf

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


darrenr
Sun May 25 05:05:03 PDT 1997
Update of /cvsroot/src/usr.sbin/ipf/ipfstat
In directory netbsd1:/home/darrenr/src/ipfilter/src/usr.sbin/ipf/src/usr.sbin/ipf/ipfstat

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


darrenr
Sun May 25 05:05:12 PDT 1997
Update of /cvsroot/src/usr.sbin/ipf/ipftest
In directory netbsd1:/home/darrenr/src/ipfilter/src/usr.sbin/ipf/src/usr.sbin/ipf/ipftest

Modified Files:
	Makefile ip_nat.c ipt.c 
Log Message:
fix conflicts


darrenr
Sun May 25 05:05:17 PDT 1997
Update of /cvsroot/src/usr.sbin/ipf/ipmon
In directory netbsd1:/home/darrenr/src/ipfilter/src/usr.sbin/ipf/src/usr.sbin/ipf/ipmon

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


darrenr
Sun May 25 05:05:22 PDT 1997
Update of /cvsroot/src/usr.sbin/ipf/ipnat
In directory netbsd1:/home/darrenr/src/ipfilter/src/usr.sbin/ipf/src/usr.sbin/ipf/ipnat

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


darrenr
Sun May 25 05:05:25 PDT 1997
Update of /cvsroot/src/usr.sbin/ipf/ipresend
In directory netbsd1:/home/darrenr/src/ipfilter/src/usr.sbin/ipf/src/usr.sbin/ipf/ipresend

Modified Files:
	Makefile 
Log Message:
fix conflicts


darrenr
Sun May 25 05:05:28 PDT 1997
Update of /cvsroot/src/usr.sbin/ipf/ipsend
In directory netbsd1:/home/darrenr/src/ipfilter/src/usr.sbin/ipf/src/usr.sbin/ipf/ipsend

Modified Files:
	Makefile 
Log Message:
fix conflicts


darrenr
Sun May 25 05:05:32 PDT 1997
Update of /cvsroot/src/usr.sbin/ipf/iptest
In directory netbsd1:/home/darrenr/src/ipfilter/src/usr.sbin/ipf/src/usr.sbin/ipf/iptest

Modified Files:
	Makefile 
Log Message:
fix conflicts


darrenr
Sun May 25 05:07:15 PDT 1997
Update of /cvsroot/src/sys
In directory netbsd1:/home/darrenr/src/ipfilter/src/sys

Log Message:
Import version 3.2alpha7

Status:

Vendor Tag:	DARRENR
Release Tags:	v3-2alpha7
		
C src/sys/netinet/ip_fil.c
C src/sys/netinet/fil.c
C src/sys/netinet/ip_nat.c
C src/sys/netinet/ip_frag.c
C src/sys/netinet/ip_state.c
C src/sys/netinet/ip_fil.h
C src/sys/netinet/ip_compat.h
C src/sys/netinet/ip_frag.h
C src/sys/netinet/ip_nat.h
C src/sys/netinet/ip_state.h
C src/sys/lkm/netinet/if_ipl/mln_ipl.c
C src/sys/lkm/netinet/if_ipl/ipl.h
C src/sys/lkm/netinet/if_ipl/Makefile

13 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jDARRENR:yesterday -jDARRENR src/sys