Module Name:	syssrc
Committed By:	veego
Date:		Wed Aug  9 21:00:45 UTC 2000

Modified Files:
	syssrc/sys/netinet: fil.c ip_auth.c ip_fil.c ip_ftp_pxy.c ip_log.c
	    ip_nat.c ip_nat.h 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.36 -r1.37 syssrc/sys/netinet/fil.c
cvs rdiff -r1.17 -r1.18 syssrc/sys/netinet/ip_auth.c
cvs rdiff -r1.57 -r1.58 syssrc/sys/netinet/ip_fil.c
cvs rdiff -r1.16 -r1.17 syssrc/sys/netinet/ip_ftp_pxy.c \
    syssrc/sys/netinet/ip_state.h
cvs rdiff -r1.10 -r1.11 syssrc/sys/netinet/ip_log.c
cvs rdiff -r1.34 -r1.35 syssrc/sys/netinet/ip_nat.c
cvs rdiff -r1.20 -r1.21 syssrc/sys/netinet/ip_nat.h
cvs rdiff -r1.4 -r1.5 syssrc/sys/netinet/ip_rcmd_pxy.c
cvs rdiff -r1.26 -r1.27 syssrc/sys/netinet/ip_state.c
cvs rdiff -r1.8 -r1.9 syssrc/sys/netinet/ipl.h

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