summaryrefslogtreecommitdiff
path: root/sys/netinet/ip_compat.h
AgeCommit message (Expand)Author
2000-06-28remove include of <vm/vm.h>mrg
2000-06-26remove/move more mach vm header files:mrg
2000-05-03Resolve conflicts.veego
1999-12-12Resolve conflicts and small fixes.veego
1998-11-22merge ipf 3.2.10mrg
1998-07-12Resolve conflicts from the import.veego
1998-05-29Resolve conflicts from the import of IPFilter 3.2.7.veego
1998-05-17Resolve conflictsveego
1998-02-10add/cleanup multiple inclusion protection.perry
1997-11-14merge ip-filter 3.2.1mrg
1997-10-30sigh. merge ipfilter 3.2 onto the trunk. merge to the branch was a mistake.mrg
1997-09-21Resolve conflicts from the merge of ipf 3.2beta5.veego
1997-07-06Restore original RCS IDs.thorpej
1997-07-05fix conflicts from importdarrenr
1997-05-28Resolve conflicts from merge of 3.2a7, take 2. Also, eliminate somethorpej
1997-05-25fix conflictsdarrenr
1997-04-15Fix SPLNET() conditional to work for NetBSD1_0+, not just the named versions.christos
1997-03-29Resolve conflicts from merge.thorpej
1997-01-05Add $NetBSD$ id's and restore the orginal Id's.veego
1997-01-05initial import of darren reed's ip-filter, version 3.1.2.mrg