source-changes: NetBSD master CVS tree commits

Subject: NetBSD master CVS tree commits
To: None <source-changes@NetBSD.ORG>
From: None <source@NetBSD.ORG>
List: source-changes
Date: 05/27/1997 22:40:05

thorpej
Tue May 27 15:34:14 PDT 1997
Update of /cvsroot/src/usr.sbin/ipf/ipf
In directory netbsd1:/var/slash-tmp/cvs-serv20887

Modified Files:
	ipf.c parse.c 
Log Message:
Resolve conflicts from merge of 3.2a7, take 2.


thorpej
Tue May 27 15:37:32 PDT 1997
Update of /cvsroot/src/usr.sbin/ipf/ipfstat
In directory netbsd1:/var/slash-tmp/cvs-serv21626

Modified Files:
	fils.c 
Log Message:
Resolve conflicts from merge of 3.2a7, take 2.