Date: Sun, 29 Oct 2000 00:53: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_ftp_pxy.c ip_nat.c ip_nat.h ip_raudio_pxy.c ip_rcmd_pxy.c ip_state.c ipl.h Message-ID: <200010290753.AAA02696@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
darrenr 2000/10/29 00:53:06 PDT
Modified files:
sys/netinet fil.c ip_ftp_pxy.c ip_nat.c ip_nat.h
ip_raudio_pxy.c ip_rcmd_pxy.c ip_state.c
ipl.h
Log:
Fix conflicts creted by import.
Revision Changes Path
1.22 +27 -24 src/sys/netinet/fil.c
1.16 +3 -1 src/sys/netinet/ip_ftp_pxy.c
1.19 +20 -19 src/sys/netinet/ip_nat.c
1.13 +2 -1 src/sys/netinet/ip_nat.h
1.7 +2 -1 src/sys/netinet/ip_raudio_pxy.c
1.7 +3 -2 src/sys/netinet/ip_rcmd_pxy.c
1.19 +2 -1 src/sys/netinet/ip_state.c
1.13 +2 -2 src/sys/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?200010290753.AAA02696>