Subject: NetBSD master CVS tree commits
To: None <source-changes@NetBSD.ORG>
From: The Source of All Evil <source@NetBSD.ORG>
List: source-changes
Date: 05/29/1998 13:50:02
ross
Fri May 29 13:45:29 PDT 1998
Update of /cvsroot/doc
In directory nb00:/tmp/cvs-serv13539

Modified Files:
	LAST_MINUTE 
Log Message:
Kill the alpha stat.h bug note.


veego
Fri May 29 13:46:46 PDT 1998
Update of /cvsroot/src/usr.sbin/ipf/ipf
In directory nb00:/tmp/cvs-serv13594/ipf

Modified Files:
	ipf.8 ipf.c parse.c 
Log Message:
Resolve conflicts from the import of IPFilter 3.2.7.


veego
Fri May 29 13:46:46 PDT 1998
Update of /cvsroot/src/usr.sbin/ipf/ipfstat
In directory nb00:/tmp/cvs-serv13594/ipfstat

Modified Files:
	ipfstat.8 
Log Message:
Resolve conflicts from the import of IPFilter 3.2.7.


veego
Fri May 29 13:46:46 PDT 1998
Update of /cvsroot/src/usr.sbin/ipf/ipmon
In directory nb00:/tmp/cvs-serv13594/ipmon

Modified Files:
	ipmon.c 
Log Message:
Resolve conflicts from the import of IPFilter 3.2.7.


veego
Fri May 29 13:46:46 PDT 1998
Update of /cvsroot/src/usr.sbin/ipf/ipnat
In directory nb00:/tmp/cvs-serv13594/ipnat

Modified Files:
	ipnat.4 ipnat.5 ipnat.c 
Log Message:
Resolve conflicts from the import of IPFilter 3.2.7.


veego
Fri May 29 13:46:46 PDT 1998
Update of /cvsroot/src/usr.sbin/ipf/ipresend
In directory nb00:/tmp/cvs-serv13594/ipresend

Modified Files:
	ipresend.1 
Log Message:
Resolve conflicts from the import of IPFilter 3.2.7.


veego
Fri May 29 13:46:47 PDT 1998
Update of /cvsroot/src/usr.sbin/ipf/ipsend
In directory nb00:/tmp/cvs-serv13594/ipsend

Modified Files:
	iplang_y.y ipsend.c 
Log Message:
Resolve conflicts from the import of IPFilter 3.2.7.


veego
Fri May 29 13:46:47 PDT 1998
Update of /cvsroot/src/usr.sbin/ipf/rules
In directory nb00:/tmp/cvs-serv13594/rules

Modified Files:
	BASIC_1.FW BASIC_2.FW ftppxy 
Log Message:
Resolve conflicts from the import of IPFilter 3.2.7.


mycroft
Fri May 29 13:48:52 PDT 1998
Update of /cvsroot/src/distrib/utils/sysinst
In directory nb00:/tmp/cvs-serv13823

Modified Files:
      Tag: netbsd-1-3
	menus.mi.eng menus.mi.fr msg.mi.eng net.c target.c upgrade.c 
Log Message:
Pull up the very last patch from fvdl.

mycroft
Fri May 29 13:48:53 PDT 1998
Update of /cvsroot/src/distrib/utils/sysinst/arch/i386
In directory nb00:/tmp/cvs-serv13823/arch/i386

Modified Files:
      Tag: netbsd-1-3
	fdisk.c md.h menus.md.eng menus.md.fr 
Log Message:
Pull up the very last patch from fvdl.