6 Commits

Author	SHA1	Message	Date
mike	fb2dc295a6	Resolve conflicts.	2001-03-26 06:11:46 +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
veego	b3bffdf856	Resolve conflicts.	2000-02-01 21:29:15 +00:00
darrenr	1904e0a218	update ipfilter code to 3.3.6	1999-12-28 07:14:53 +00:00
veego	99f380af25	Import a few IP Filter 3.3.5 files under sys/netinet.	1999-12-12 10:57:57 +00:00