Commit Graph

11 Commits

Author SHA1 Message Date
mike
fb2dc295a6 Resolve conflicts. 2001-03-26 06:11:46 +00:00
veego
c02ef5cc85 Resolve conflicts. 2000-05-23 06:07:42 +00:00
veego
21dea2100c Resolve conflicts. 2000-05-03 11:12:03 +00:00
veego
64b2c34646 Resolve conflicts and small fixes. 1999-12-12 11:11:15 +00:00
mrg
78db9d7d95 merge ipf 3.2.10 1998-11-22 15:17:18 +00:00
christos
66dd35d72c Fix copyright spacing and 'Van' -> 'van' for consistency. 1998-09-13 15:45:40 +00:00
perry
f73530ba55 add/cleanup multiple inclusion protection. 1998-02-10 01:26:19 +00:00
mrg
61cbfaca09 import ip-filter 3.2.1 1997-11-14 08:03:01 +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
thorpej
5a85b0d9fa Import ip_auth.h from IPFilter 3.2beta1; this was missed during the
upgrade.
1997-07-06 04:58:52 +00:00