Date: Sun, 4 Feb 2001 06:24:32 -0800 (PST) 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_compat.h ip_fil.h ip_frag.c ip_frag.h ip_ftp_pxy.c ip_nat.c ip_nat.h ip_proxy.h ip_rcmd_pxy.c ip_state.c ipl.h mlfk_ipl.c Message-ID: <200102041424.f14EOWL31289@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
darrenr 2001/02/04 06:24:32 PST
Modified files:
sys/netinet fil.c ip_auth.c ip_compat.h ip_fil.h
ip_frag.c ip_frag.h ip_ftp_pxy.c ip_nat.c
ip_nat.h ip_proxy.h ip_rcmd_pxy.c
ip_state.c ipl.h mlfk_ipl.c
Log:
fix conflicts
Revision Changes Path
1.23 +72 -15 src/sys/netinet/fil.c
1.21 +2 -2 src/sys/netinet/ip_auth.c
1.13 +17 -5 src/sys/netinet/ip_compat.h
1.18 +5 -2 src/sys/netinet/ip_fil.h
1.14 +10 -12 src/sys/netinet/ip_frag.c
1.11 +3 -2 src/sys/netinet/ip_frag.h
1.17 +22 -9 src/sys/netinet/ip_ftp_pxy.c
1.20 +99 -55 src/sys/netinet/ip_nat.c
1.14 +6 -5 src/sys/netinet/ip_nat.h
1.9 +3 -2 src/sys/netinet/ip_proxy.h
1.8 +3 -3 src/sys/netinet/ip_rcmd_pxy.c
1.20 +11 -13 src/sys/netinet/ip_state.c
1.14 +2 -2 src/sys/netinet/ipl.h
1.8 +13 -1 src/sys/netinet/mlfk_ipl.c
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?200102041424.f14EOWL31289>