Date: Sat, 28 Jul 2001 04:58:31 -0700 (PDT) From: Darren Reed <darrenr@FreeBSD.org> To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/sys/contrib/ipfilter/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_state.c ip_state.h ipl.h Message-ID: <200107281158.f6SBwV351553@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
darrenr 2001/07/28 04:58:30 PDT
Modified files:
sys/contrib/ipfilter/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_state.c
ip_state.h ipl.h
Log:
fix conflicts created by import
Revision Changes Path
1.24 +76 -60 src/sys/contrib/ipfilter/netinet/fil.c
1.22 +152 -65 src/sys/contrib/ipfilter/netinet/ip_auth.c
1.11 +5 -8 src/sys/contrib/ipfilter/netinet/ip_auth.h
1.14 +60 -37 src/sys/contrib/ipfilter/netinet/ip_compat.h
1.26 +149 -65 src/sys/contrib/ipfilter/netinet/ip_fil.c
1.19 +17 -12 src/sys/contrib/ipfilter/netinet/ip_fil.h
1.16 +60 -17 src/sys/contrib/ipfilter/netinet/ip_frag.c
1.13 +6 -5 src/sys/contrib/ipfilter/netinet/ip_frag.h
1.18 +89 -21 src/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c
1.18 +20 -47 src/sys/contrib/ipfilter/netinet/ip_log.c
1.23 +89 -67 src/sys/contrib/ipfilter/netinet/ip_nat.c
1.16 +20 -12 src/sys/contrib/ipfilter/netinet/ip_nat.h
1.12 +22 -13 src/sys/contrib/ipfilter/netinet/ip_proxy.c
1.10 +5 -6 src/sys/contrib/ipfilter/netinet/ip_proxy.h
1.8 +14 -8 src/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c
1.22 +43 -30 src/sys/contrib/ipfilter/netinet/ip_state.c
1.11 +9 -7 src/sys/contrib/ipfilter/netinet/ip_state.h
1.15 +4 -6 src/sys/contrib/ipfilter/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?200107281158.f6SBwV351553>