thorpej 57d41e13fb Resolve conflicts from merge of 3.2a7, take 2.

1997-05-27 22:34:05 +00:00

..

ipf

Resolve conflicts from merge of 3.2a7, take 2.

1997-05-27 22:34:05 +00:00

ipfstat

Resolve conflicts from merge of 3.2a7, take 2.

1997-05-27 22:34:05 +00:00

ipftest

ipfilter2netbsd did not produce correct output for last import of

1997-05-27 22:16:47 +00:00

ipmon

ipfilter2netbsd did not produce correct output for last import of

1997-05-27 22:16:47 +00:00

ipnat

…

ipresend

ipfilter2netbsd did not produce correct output for last import of

1997-05-27 22:16:47 +00:00

ipsend

ipfilter2netbsd did not produce correct output for last import of

1997-05-27 22:16:47 +00:00

iptest

…

ipfilter2netbsd

Correct several mistakes:

1997-05-27 22:24:25 +00:00

Makefile

…

Makefile.inc

…