veego
Sun Sep 21 11:01:02 PDT 1997
Update of /cvsroot/src/usr.sbin/ipf/ipf
In directory netbsd1:/home/veego/src/usr.sbin/ipf/ipf

Modified Files:
	Makefile ipf.c ipl.4 parse.c 
Log Message:
Resolve conflicts from the merge of ipf 3.2beta5.


veego
Sun Sep 21 11:01:13 PDT 1997
Update of /cvsroot/src/usr.sbin/ipf/ipfstat
In directory netbsd1:/home/veego/src/usr.sbin/ipf/ipfstat

Modified Files:
	Makefile fils.c 
Log Message:
Resolve conflicts from the merge of ipf 3.2beta5.


veego
Sun Sep 21 11:01:46 PDT 1997
Update of /cvsroot/src/usr.sbin/ipf/ipftest
In directory netbsd1:/home/veego/src/usr.sbin/ipf/ipftest

Modified Files:
	Makefile ipt.c 
Log Message:
Resolve conflicts from the merge of ipf 3.2beta5.


veego
Sun Sep 21 11:01:52 PDT 1997
Update of /cvsroot/src/usr.sbin/ipf/ipmon
In directory netbsd1:/home/veego/src/usr.sbin/ipf/ipmon

Modified Files:
	Makefile ipmon.c 
Log Message:
Resolve conflicts from the merge of ipf 3.2beta5.


veego
Sun Sep 21 11:01:57 PDT 1997
Update of /cvsroot/src/usr.sbin/ipf/ipnat
In directory netbsd1:/home/veego/src/usr.sbin/ipf/ipnat

Modified Files:
	Makefile ipnat.c 
Log Message:
Resolve conflicts from the merge of ipf 3.2beta5.


veego
Sun Sep 21 11:02:01 PDT 1997
Update of /cvsroot/src/usr.sbin/ipf/ipresend
In directory netbsd1:/home/veego/src/usr.sbin/ipf/ipresend

Modified Files:
	Makefile resend.c 
Log Message:
Resolve conflicts from the merge of ipf 3.2beta5.


veego
Sun Sep 21 11:02:18 PDT 1997
Update of /cvsroot/src/usr.sbin/ipf/ipsend
In directory netbsd1:/home/veego/src/usr.sbin/ipf/ipsend

Modified Files:
	44arp.c Makefile ip.c iplang_y.y ipsend.c ipsend.h ipsopt.c 
	sbpf.c 
Log Message:
Resolve conflicts from the merge of ipf 3.2beta5.


veego
Sun Sep 21 11:02:28 PDT 1997
Update of /cvsroot/src/usr.sbin/ipf/iptest
In directory netbsd1:/home/veego/src/usr.sbin/ipf/iptest

Modified Files:
	Makefile iptest.c iptests.c sock.c 
Log Message:
Resolve conflicts from the merge of ipf 3.2beta5.


veego
Sun Sep 21 11:03:37 PDT 1997
Update of /cvsroot/src/sys/netinet
In directory netbsd1:/home/veego/src/sys/netinet

Modified Files:
	fil.c ip_auth.c ip_compat.h ip_fil.c ip_fil.h ip_frag.c 
	ip_frag.h ip_ftp_pxy.c ip_nat.c ip_nat.h ip_proxy.c ip_proxy.h 
	ip_state.c ip_state.h 
Log Message:
Resolve conflicts from the merge of ipf 3.2beta5.


veego
Sun Sep 21 11:04:02 PDT 1997
Update of /cvsroot/src/sys/lkm/netinet/if_ipl
In directory netbsd1:/home/veego/src/sys/lkm/netinet/if_ipl

Modified Files:
	Makefile ipl.h mln_ipl.c 
Log Message:
Resolve conflicts from the merge of ipf 3.2beta5.