6 Commits

Author	SHA1	Message	Date
veego	97ab1bd53b	Resolve conflicts from the import.	1998-07-12 15:23:59 +00:00
veego	82423e3d01	Resolve conflicts	1998-05-17 16:50:15 +00:00
mrg	84ecff38c2	merge ip-filter 3.2.1	1997-11-14 12:40:06 +00:00
mrg	60c28e1f95	sigh. merge ipfilter 3.2 onto the trunk. merge to the branch was a mistake.	1997-10-30 16:08:54 +00:00
mrg	44c002beb1	import ip-filter 3.2	1997-10-30 05:27:24 +00:00
veego	985ac74a98	Import ip-filter 3.2beta5	1997-09-21 16:47:50 +00:00