5 Commits

Author	SHA1	Message	Date
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