mrg
|
d3224441a0
|
merge ipf 3.2.10
|
1998-11-22 14:41:29 +00:00 |
|
veego
|
e3d44c6e25
|
Resolve conflicts from the import.
|
1998-07-12 15:11:50 +00:00 |
|
veego
|
a5aa2efa3d
|
Resolve conflicts from the import of IPFilter 3.2.7.
|
1998-05-29 20:32:01 +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
|
3f0ebb2220
|
sigh. merge ipfilter 3.2 onto the trunk. merge to the branch was a mistake.
|
1997-10-30 15:39:56 +00:00 |
|
veego
|
4508fb4354
|
Resolve conflicts from the merge of ipf 3.2beta5.
|
1997-09-21 18:00:54 +00:00 |
|
darrenr
|
a7a52d12c8
|
fix conflicts from import
|
1997-07-05 05:52:39 +00:00 |
|
thorpej
|
b987e82127
|
CVS munched date on copyright; correct it.
|
1997-05-28 02:11:10 +00:00 |
|
thorpej
|
bbf6e6fb4d
|
Fix a typo.
|
1997-05-28 00:22:43 +00:00 |
|
thorpej
|
9062a97000
|
Resolve conflicts from merge of 3.2a7, take 2.
|
1997-05-28 00:22:15 +00:00 |
|
thorpej
|
99f4b72f6c
|
Resolve conflicts from merge.
XXX doesn't compile yet, but that will require some other changes, which
XXX I want to make separately.
|
1997-03-29 01:42:33 +00:00 |
|
darrenr
|
fe3bc025d0
|
Bring in entire 3.2alpha2 source tree
|
1997-03-27 15:13:58 +00:00 |
|
mrg
|
85f84f08cd
|
initial import of darren reed's ip-filter, version 3.1.2.
|
1997-01-05 13:26:10 +00:00 |