Subject: NetBSD master CVS tree commits
To: None <source-changes@NetBSD.ORG>
From: None <source@NetBSD.ORG>
List: source-changes
Date: 10/30/1997 16:20:04
mrg
Thu Oct 30 08:10:02 PST 1997
Update of /cvsroot/src/usr.sbin/ipf
In directory netbsd1:/var/slash-tmp/cvs-serv14180

Modified Files:
	Makefile.inc ipfilter2netbsd 
Log Message:
sigh.  merge ipfilter 3.2 onto the trunk.  merge to the branch was a mistake.


mrg
Thu Oct 30 08:10:08 PST 1997
Update of /cvsroot/src/usr.sbin/ipf/ipf
In directory netbsd1:/var/slash-tmp/cvs-serv14180/ipf

Modified Files:
	ipf.c parse.c 
Log Message:
sigh.  merge ipfilter 3.2 onto the trunk.  merge to the branch was a mistake.


mrg
Thu Oct 30 08:10:10 PST 1997
Update of /cvsroot/src/usr.sbin/ipf/ipfstat
In directory netbsd1:/var/slash-tmp/cvs-serv14180/ipfstat

Modified Files:
	fils.c 
Log Message:
sigh.  merge ipfilter 3.2 onto the trunk.  merge to the branch was a mistake.


mrg
Thu Oct 30 08:10:16 PST 1997
Update of /cvsroot/src/usr.sbin/ipf/ipftest
In directory netbsd1:/var/slash-tmp/cvs-serv14180/ipftest

Modified Files:
	ipt.c 
Log Message:
sigh.  merge ipfilter 3.2 onto the trunk.  merge to the branch was a mistake.


mrg
Thu Oct 30 08:10:18 PST 1997
Update of /cvsroot/src/usr.sbin/ipf/ipftest/test/input
In directory netbsd1:/var/slash-tmp/cvs-serv14180/ipftest/test/input

Removed Files:
	input.sed 
Log Message:
sigh.  merge ipfilter 3.2 onto the trunk.  merge to the branch was a mistake.


mrg
Thu Oct 30 08:10:21 PST 1997
Update of /cvsroot/src/usr.sbin/ipf/ipmon
In directory netbsd1:/var/slash-tmp/cvs-serv14180/ipmon

Modified Files:
	ipmon.c 
Log Message:
sigh.  merge ipfilter 3.2 onto the trunk.  merge to the branch was a mistake.


mrg
Thu Oct 30 08:10:23 PST 1997
Update of /cvsroot/src/usr.sbin/ipf/ipnat
In directory netbsd1:/var/slash-tmp/cvs-serv14180/ipnat

Modified Files:
	ipnat.c 
Log Message:
sigh.  merge ipfilter 3.2 onto the trunk.  merge to the branch was a mistake.


mrg
Thu Oct 30 08:10:26 PST 1997
Update of /cvsroot/src/usr.sbin/ipf/ipresend
In directory netbsd1:/var/slash-tmp/cvs-serv14180/ipresend

Modified Files:
	resend.c 
Log Message:
sigh.  merge ipfilter 3.2 onto the trunk.  merge to the branch was a mistake.


mrg
Thu Oct 30 08:10:40 PST 1997
Update of /cvsroot/src/usr.sbin/ipf/ipsend
In directory netbsd1:/var/slash-tmp/cvs-serv14180/ipsend

Modified Files:
	44arp.c ip.c iplang_y.y ipsend.c ipsend.h ipsopt.c sbpf.c 
Log Message:
sigh.  merge ipfilter 3.2 onto the trunk.  merge to the branch was a mistake.


mrg
Thu Oct 30 08:10:48 PST 1997
Update of /cvsroot/src/usr.sbin/ipf/iptest
In directory netbsd1:/var/slash-tmp/cvs-serv14180/iptest

Modified Files:
	iptest.c iptests.c sock.c 
Log Message:
sigh.  merge ipfilter 3.2 onto the trunk.  merge to the branch was a mistake.