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: 09/21/1997 17:10:03

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

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