Module Name:	syssrc
Committed By:	veego
Date:		Tue May 23 06:07:45 UTC 2000

Modified Files:
	syssrc/sys/netinet: fil.c ip_auth.c ip_auth.h ip_fil.c ip_fil.h
	    ip_state.c ipl.h

Log Message:
Resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.34 -r1.35 syssrc/sys/netinet/fil.c
cvs rdiff -r1.16 -r1.17 syssrc/sys/netinet/ip_auth.c
cvs rdiff -r1.6 -r1.7 syssrc/sys/netinet/ip_auth.h syssrc/sys/netinet/ipl.h
cvs rdiff -r1.52 -r1.53 syssrc/sys/netinet/ip_fil.c
cvs rdiff -r1.35 -r1.36 syssrc/sys/netinet/ip_fil.h
cvs rdiff -r1.25 -r1.26 syssrc/sys/netinet/ip_state.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.