source-changes: NetBSD master CVS tree commits

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/17/1998 10:00:01

veego
Sun May 17 09:50:16 PDT 1998
Update of /cvsroot/src/usr.sbin/ipf/ipf
In directory nb00:/tmp/cvs-serv26369

Modified Files:
	ipf.8 ipf.c parse.c 
Log Message:
Resolve conflicts

veego
Sun May 17 09:51:09 PDT 1998
Update of /cvsroot/src/usr.sbin/ipf/ipfstat
In directory nb00:/tmp/cvs-serv26403

Modified Files:
	fils.c 
Log Message:
Resolve conflicts

veego
Sun May 17 09:51:42 PDT 1998
Update of /cvsroot/src/usr.sbin/ipf/ipmon
In directory nb00:/tmp/cvs-serv26423

Modified Files:
	ipmon.8 ipmon.c 
Log Message:
Resolve conflicts

veego
Sun May 17 09:52:11 PDT 1998
Update of /cvsroot/src/usr.sbin/ipf/ipnat
In directory nb00:/tmp/cvs-serv26448

Modified Files:
	ipnat.c 
Log Message:
Resolve conflicts

veego
Sun May 17 09:52:42 PDT 1998
Update of /cvsroot/src/usr.sbin/ipf/ipresend
In directory nb00:/tmp/cvs-serv26468

Modified Files:
	ipresend.1 
Log Message:
Resolve conflicts

veego
Sun May 17 09:53:25 PDT 1998
Update of /cvsroot/src/usr.sbin/ipf/ipsend
In directory nb00:/tmp/cvs-serv26488

Modified Files:
	iplang_l.l iplang_y.y ipsend.1 
Log Message:
Resolve conflicts

veego
Sun May 17 09:54:29 PDT 1998
Update of /cvsroot/src/usr.sbin/ipf/iptest
In directory nb00:/tmp/cvs-serv26518

Modified Files:
	iptest.1 iptest.c iptests.c sock.c 
Log Message:
Resolve conflicts

veego
Sun May 17 09:55:03 PDT 1998
Update of /cvsroot/src/usr.sbin/ipf/rules
In directory nb00:/tmp/cvs-serv26553

Modified Files:
	mkfilters.1 
Log Message:
Resolve conflicts

veego
Sun May 17 09:56:20 PDT 1998
Update of /cvsroot/src/usr.sbin/ipf/ipsend
In directory nb00:/tmp/cvs-serv26581

Modified Files:
	ip.c 
Log Message:
Resolve conflicts