Date: Tue, 19 Mar 2002 03:44:17 -0800 (PST) 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_rcmd_pxy.c ip_state.c ip_state.h ipl.h ... Message-ID: <200203191144.g2JBiHw53931@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
darrenr 2002/03/19 03:44:17 PST
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_rcmd_pxy.c
ip_state.c ip_state.h ipl.h
mlfk_ipl.c
Log:
fix conflicts (mostly damn rcs id's) generated by import
Revision Changes Path
1.28 +116 -85 src/sys/contrib/ipfilter/netinet/fil.c
1.27 +6 -8 src/sys/contrib/ipfilter/netinet/ip_auth.c
1.12 +3 -2 src/sys/contrib/ipfilter/netinet/ip_auth.h
1.15 +396 -52 src/sys/contrib/ipfilter/netinet/ip_compat.h
1.31 +449 -133 src/sys/contrib/ipfilter/netinet/ip_fil.c
1.21 +51 -39 src/sys/contrib/ipfilter/netinet/ip_fil.h
1.20 +12 -7 src/sys/contrib/ipfilter/netinet/ip_frag.c
1.14 +11 -7 src/sys/contrib/ipfilter/netinet/ip_frag.h
1.19 +102 -48 src/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c
1.21 +39 -35 src/sys/contrib/ipfilter/netinet/ip_log.c
1.28 +282 -183 src/sys/contrib/ipfilter/netinet/ip_nat.c
1.17 +14 -8 src/sys/contrib/ipfilter/netinet/ip_nat.h
1.15 +114 -27 src/sys/contrib/ipfilter/netinet/ip_proxy.c
1.11 +21 -3 src/sys/contrib/ipfilter/netinet/ip_proxy.h
1.9 +10 -7 src/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c
1.9 +13 -13 src/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c
1.25 +409 -200 src/sys/contrib/ipfilter/netinet/ip_state.c
1.12 +12 -6 src/sys/contrib/ipfilter/netinet/ip_state.h
1.16 +3 -3 src/sys/contrib/ipfilter/netinet/ipl.h
1.10 +5 -1 src/sys/contrib/ipfilter/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?200203191144.g2JBiHw53931>