Date: Wed, 19 Jul 2000 07:02:10 -0700 (PDT) From: Darren Reed <darrenr@FreeBSD.org> To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/sys/netinet fil.c ip_auth.c ip_fil.c ip_fil.h ip_frag.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 Message-ID: <200007191402.HAA27559@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
darrenr 2000/07/19 07:02:10 PDT
Modified files:
sys/netinet fil.c ip_auth.c ip_fil.c ip_fil.h
ip_frag.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:
fix conflicts
Revision Changes Path
1.18 +25 -20 src/sys/netinet/fil.c
1.17 +2 -2 src/sys/netinet/ip_auth.c
1.17 +36 -6 src/sys/netinet/ip_fil.c
1.16 +4 -4 src/sys/netinet/ip_fil.h
1.12 +5 -2 src/sys/netinet/ip_frag.c
1.13 +54 -44 src/sys/netinet/ip_ftp_pxy.c
1.16 +7 -3 src/sys/netinet/ip_log.c
1.16 +49 -19 src/sys/netinet/ip_nat.c
1.11 +11 -6 src/sys/netinet/ip_nat.h
1.6 +13 -6 src/sys/netinet/ip_rcmd_pxy.c
1.16 +22 -4 src/sys/netinet/ip_state.c
1.9 +4 -4 src/sys/netinet/ip_state.h
1.10 +2 -2 src/sys/netinet/ipl.h
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200007191402.HAA27559>