Module Name:	syssrc
Committed By:	veego
Date:		Tue Feb  1 21:29:17 UTC 2000

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

Log Message:
Resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.28 -r1.29 syssrc/sys/netinet/fil.c
cvs rdiff -r1.12 -r1.13 syssrc/sys/netinet/ip_auth.c
cvs rdiff -r1.38 -r1.39 syssrc/sys/netinet/ip_fil.c
cvs rdiff -r1.33 -r1.34 syssrc/sys/netinet/ip_fil.h
cvs rdiff -r1.27 -r1.28 syssrc/sys/netinet/ip_nat.c
cvs rdiff -r1.16 -r1.17 syssrc/sys/netinet/ip_nat.h
cvs rdiff -r1.2 -r1.3 syssrc/sys/netinet/ip_raudio_pxy.c \
    syssrc/sys/netinet/ipl.h
cvs rdiff -r1.20 -r1.21 syssrc/sys/netinet/ip_state.c
cvs rdiff -r1.14 -r1.15 syssrc/sys/netinet/ip_state.h

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