Module Name:	syssrc
Committed By:	veego
Date:		Wed May  3 11:12:15 UTC 2000

Modified Files:
	syssrc/sys/lkm/netinet/if_ipl: Makefile mln_ipl.c
	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.c 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.11 -r1.12 syssrc/sys/lkm/netinet/if_ipl/Makefile
cvs rdiff -r1.22 -r1.23 syssrc/sys/lkm/netinet/if_ipl/mln_ipl.c
cvs rdiff -r1.30 -r1.31 syssrc/sys/netinet/fil.c syssrc/sys/netinet/ip_nat.c
cvs rdiff -r1.15 -r1.16 syssrc/sys/netinet/ip_auth.c \
    syssrc/sys/netinet/ip_state.h
cvs rdiff -r1.5 -r1.6 syssrc/sys/netinet/ip_auth.h
cvs rdiff -r1.17 -r1.18 syssrc/sys/netinet/ip_compat.h \
    syssrc/sys/netinet/ip_frag.c syssrc/sys/netinet/ip_nat.h
cvs rdiff -r1.48 -r1.49 syssrc/sys/netinet/ip_fil.c
cvs rdiff -r1.34 -r1.35 syssrc/sys/netinet/ip_fil.h
cvs rdiff -r1.13 -r1.14 syssrc/sys/netinet/ip_frag.h \
    syssrc/sys/netinet/ip_ftp_pxy.c syssrc/sys/netinet/ip_proxy.h
cvs rdiff -r1.9 -r1.10 syssrc/sys/netinet/ip_log.c
cvs rdiff -r1.20 -r1.21 syssrc/sys/netinet/ip_proxy.c
cvs rdiff -r1.3 -r1.4 syssrc/sys/netinet/ip_raudio_pxy.c \
    syssrc/sys/netinet/ipl.h
cvs rdiff -r1.2 -r1.3 syssrc/sys/netinet/ip_rcmd_pxy.c
cvs rdiff -r1.23 -r1.24 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.