Module Name:	syssrc
Committed By:	mike
Date:		Mon Mar 26 06:13:14 UTC 2001

Modified Files:
	syssrc/sys/netinet: fil.c ip_auth.c ip_auth.h ip_compat.h ip_fil.c
	    ip_fil.h ip_frag.c ip_frag.h ip_ftp_pxy.c ip_log.c ip_nat.c
	    ip_nat.h ip_proxy.h ip_raudio_pxy.c ip_rcmd_pxy.c ip_state.c
	    ip_state.h ipl.h

Log Message:
Resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.45 -r1.46 syssrc/sys/netinet/fil.c
cvs rdiff -r1.18 -r1.19 syssrc/sys/netinet/ip_auth.c
cvs rdiff -r1.7 -r1.8 syssrc/sys/netinet/ip_auth.h
cvs rdiff -r1.21 -r1.22 syssrc/sys/netinet/ip_compat.h \
    syssrc/sys/netinet/ip_frag.c syssrc/sys/netinet/ip_nat.h
cvs rdiff -r1.65 -r1.66 syssrc/sys/netinet/ip_fil.c
cvs rdiff -r1.38 -r1.39 syssrc/sys/netinet/ip_fil.h
cvs rdiff -r1.14 -r1.15 syssrc/sys/netinet/ip_frag.h
cvs rdiff -r1.17 -r1.18 syssrc/sys/netinet/ip_ftp_pxy.c \
    syssrc/sys/netinet/ip_state.h
cvs rdiff -r1.12 -r1.13 syssrc/sys/netinet/ip_log.c
cvs rdiff -r1.37 -r1.38 syssrc/sys/netinet/ip_nat.c
cvs rdiff -r1.15 -r1.16 syssrc/sys/netinet/ip_proxy.h
cvs rdiff -r1.5 -r1.6 syssrc/sys/netinet/ip_raudio_pxy.c \
    syssrc/sys/netinet/ip_rcmd_pxy.c
cvs rdiff -r1.28 -r1.29 syssrc/sys/netinet/ip_state.c
cvs rdiff -r1.9 -r1.10 syssrc/sys/netinet/ipl.h

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