lukem
ea1cd7eb08
add RCSIDs
2001-11-13 00:32:34 +00:00
mike
fb2dc295a6
Resolve conflicts.
2001-03-26 06:11:46 +00:00
veego
b3d0df91fb
Resolve conflicts.
2000-08-09 21:00:39 +00:00
veego
4c4ad1d1a5
Resolve conflicts.
2000-05-21 18:45:53 +00:00
veego
8db28cd918
Resolve conflicts and fix a compile error in ip_ftp_pxy.c.
2000-05-11 19:46:05 +00:00
veego
21dea2100c
Resolve conflicts.
2000-05-03 11:12:03 +00:00
augustss
8529438fe6
Remove register declarations.
2000-03-30 12:51:13 +00:00
veego
64b2c34646
Resolve conflicts and small fixes.
1999-12-12 11:11:15 +00:00
mrg
4dd9bebb58
add two more prototypes. noted missing by mjacob.
1998-11-22 23:30:36 +00:00
mrg
78db9d7d95
merge ipf 3.2.10
1998-11-22 15:17:18 +00:00
veego
97ab1bd53b
Resolve conflicts from the import.
1998-07-12 15:23:59 +00:00
veego
a4c89e3e2e
Resolve conflicts from the import of IPFilter 3.2.7.
1998-05-29 20:24:36 +00:00
mrg
84ecff38c2
merge ip-filter 3.2.1
1997-11-14 12:40:06 +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
darrenr
729f0dc597
fix conflicts from import
1997-07-05 05:38:14 +00:00
thorpej
41d4822677
Resolve conflicts from merge of 3.2a7, take 2. Also, eliminate some
...
silly differences between the NetBSD copy of the code and the
vendor branch, keeping only those which are necessary. Of those
differences that currently exist, several "portability to NetBSD"
issues, which will be fed back to the ipfilter author.
1997-05-28 00:17:11 +00:00
thorpej
5d1bb7474a
Make this compile on 32-bit architectures:
...
- Add prototypes.
- garbage-collect unused variables.
1997-05-27 01:19:48 +00:00
darrenr
27be4b8f04
Import new sources for 3.2alpha7
...
(blah, someone want to clean away /cvsroot/sys/netinet ?)
1997-05-26 15:18:15 +00:00
