Module Name:	syssrc
Committed By:	veego
Date:		Thu May 11 19:46:07 UTC 2000

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

Log Message:
Resolve conflicts and fix a compile error in ip_ftp_pxy.c.


To generate a diff of this commit:
cvs rdiff -r1.32 -r1.33 syssrc/sys/netinet/fil.c
cvs rdiff -r1.49 -r1.50 syssrc/sys/netinet/ip_fil.c
cvs rdiff -r1.18 -r1.19 syssrc/sys/netinet/ip_frag.c
cvs rdiff -r1.14 -r1.15 syssrc/sys/netinet/ip_ftp_pxy.c \
    syssrc/sys/netinet/ip_proxy.h
cvs rdiff -r1.31 -r1.32 syssrc/sys/netinet/ip_nat.c
cvs rdiff -r1.21 -r1.22 syssrc/sys/netinet/ip_proxy.c
cvs rdiff -r1.4 -r1.5 syssrc/sys/netinet/ip_raudio_pxy.c \
    syssrc/sys/netinet/ipl.h
cvs rdiff -r1.3 -r1.4 syssrc/sys/netinet/ip_rcmd_pxy.c

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