Darren Reed
68d1243587
fix conflicts generated by import, completing import of ipf3.4.25
2002-03-19 11:48:16 +00:00
Darren Reed
33fe2fbd37
fix conflicts from rcsids
2000-10-26 12:47:40 +00:00
Peter Wemm
96c630d7b2
Not in this commit: Many spammed deltas have been removed to restore
...
back to the vendor branch.
Re-merge changes from the vendor branch.
Undo the local spammed changes that I could find. There are probably
more local fixes that were clobbered that I've missed.
2000-02-10 03:17:51 +00:00
Peter Wemm
dd21baedfd
Merge 3.2.3 -> 3.2.7 changes into mainline.
1998-06-20 18:43:25 +00:00
Joseph Koshy
68bf8f9eea
Spelling fixes.
...
Submitted by: Josh Gilliam <josh@quick.net>
PR: 6880
1998-06-08 06:12:02 +00:00
Peter Wemm
f4b66beedb
Import ipfilter 3.2.3
1998-03-21 10:04:55 +00:00
Peter Wemm
af5dd3181a
Import ipfilter 3.2.1 (update from 3.1.8)
1997-11-16 04:52:19 +00:00
Darren Reed
5a1a935563
Import IP Filter version 3.2alpha4 to bring in working LKM for 2.2
1997-04-03 10:22:02 +00:00
Darren Reed
b4ebec5bf8
Import IP Filter v3.1.7 into FreeBSD tree
1997-02-09 22:50:16 +00:00