5 Commits

Author	SHA1	Message	Date
thorpej	c4aac2cbce	Resolve conflicts from merge of 3.2a7, take 2.	1997-05-27 22:51:36 +00:00
darrenr	87427f3d2e	fix conflicts	1997-05-25 12:04:53 +00:00
thorpej	e612682b6c	getopt() returns an int, not a char.	1997-04-19 06:27:03 +00:00
darrenr	e8fb8bd3a9	Properly import usr.sbin/ipf updates	1997-03-29 02:49:40 +00:00
mrg	4810e839ab	initial import of darren reed's ip-filter, version 3.1.2.	1997-01-05 13:06:38 +00:00