Darren Reed
561e006b67
resolve conflicts
2000-08-13 05:00:44 +00:00
Darren Reed
c0230397c7
fix conflicts
2000-07-19 13:56:18 +00:00
Darren Reed
8312b3f4f7
fix conflicts
2000-05-24 02:19:15 +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
Bruce Evans
234e2f5964
Fixed the type of a signal handler.
1998-10-17 14:47:00 +00:00
Peter Wemm
dd21baedfd
Merge 3.2.3 -> 3.2.7 changes into mainline.
1998-06-20 18:43:25 +00:00
Peter Wemm
6314ca637f
Some tweaks to get this to compile for the userland tools.
1998-03-21 13:39:11 +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
0eab801c99
Import version 3.2alpha7
1997-05-25 15:45:04 +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
