Date: Wed, 16 Aug 2006 12:06:36 +0000 (UTC) From: Guido van Rooij <guido@FreeBSD.org> To: src-committers@FreeBSD.org, cvs-src@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.h ip_fil_freebsd.c ip_frag.c ip_ftp_pxy.c ip_log.c ip_nat.c ip_proxy.c ip_rcmd_pxy.c ip_state.c ip_sync.c ipl.h mlfk_ipl.c Message-ID: <200608161206.k7GC6ao2055627@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
guido 2006-08-16 12:06:36 UTC
FreeBSD src repository
Modified files:
sys/contrib/ipfilter/netinet fil.c ip_auth.c ip_auth.h
ip_compat.h ip_fil.h
ip_fil_freebsd.c ip_frag.c
ip_ftp_pxy.c ip_log.c ip_nat.c
ip_proxy.c ip_rcmd_pxy.c
ip_state.c ip_sync.c ipl.h
mlfk_ipl.c
Log:
Resolve conflicts
MFC after: 2 weeks
Revision Changes Path
1.50 +102 -108 src/sys/contrib/ipfilter/netinet/fil.c
1.43 +35 -23 src/sys/contrib/ipfilter/netinet/ip_auth.c
1.15 +3 -1 src/sys/contrib/ipfilter/netinet/ip_auth.h
1.32 +9 -1 src/sys/contrib/ipfilter/netinet/ip_compat.h
1.34 +17 -3 src/sys/contrib/ipfilter/netinet/ip_fil.h
1.4 +27 -20 src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
1.31 +5 -7 src/sys/contrib/ipfilter/netinet/ip_frag.c
1.27 +10 -9 src/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c
1.32 +25 -2 src/sys/contrib/ipfilter/netinet/ip_log.c
1.41 +100 -115 src/sys/contrib/ipfilter/netinet/ip_nat.c
1.28 +14 -11 src/sys/contrib/ipfilter/netinet/ip_proxy.c
1.14 +2 -2 src/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c
1.37 +72 -48 src/sys/contrib/ipfilter/netinet/ip_state.c
1.4 +16 -7 src/sys/contrib/ipfilter/netinet/ip_sync.c
1.25 +3 -3 src/sys/contrib/ipfilter/netinet/ipl.h
1.18 +61 -1 src/sys/contrib/ipfilter/netinet/mlfk_ipl.c
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200608161206.k7GC6ao2055627>