Commit Graph

8 Commits

Author SHA1 Message Date
mrg 78db9d7d95 merge ipf 3.2.10 1998-11-22 15:17:18 +00:00
veego 1198b69377 Resolve conflicts from the import of IPFilter 3.2.7. 1998-05-29 20:46:45 +00:00
veego 82423e3d01 Resolve conflicts 1998-05-17 16:50:15 +00:00
mrg d2143111bd merge ip-filter 3.2.1 1997-11-14 12:57:55 +00:00
thorpej 3d2b522093 Don't prototype ether_aton() here if __NetBSD__. 1997-11-08 05:57:15 +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
veego 4508fb4354 Resolve conflicts from the merge of ipf 3.2beta5. 1997-09-21 18:00:54 +00:00
veego 985ac74a98 Import ip-filter 3.2beta5 1997-09-21 16:47:50 +00:00