Date: Sat, 12 Aug 2000 21:31:06 -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_compat.h ip_fil.c ip_ftp_pxy.c ip_log.c ip_nat.c ip_state.c ipl.h mlfk_ipl.c Message-ID: <200008130431.VAA75777@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
darrenr 2000/08/12 21:31:06 PDT
Modified files:
sys/netinet fil.c ip_compat.h ip_fil.c ip_ftp_pxy.c
ip_log.c ip_nat.c ip_state.c ipl.h
mlfk_ipl.c
Log:
resolve conflicts
Revision Changes Path
1.19 +32 -17 src/sys/netinet/fil.c
1.10 +5 -1 src/sys/netinet/ip_compat.h
1.21 +4 -2 src/sys/netinet/ip_fil.c
1.14 +3 -3 src/sys/netinet/ip_ftp_pxy.c
1.17 +1 -3 src/sys/netinet/ip_log.c
1.17 +67 -21 src/sys/netinet/ip_nat.c
1.17 +248 -50 src/sys/netinet/ip_state.c
1.11 +2 -2 src/sys/netinet/ipl.h
1.6 +3 -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?200008130431.VAA75777>