From owner-cvs-all Thu Oct 26 5:33:47 2000 Delivered-To: cvs-all@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id BD4C337B479; Thu, 26 Oct 2000 05:33:43 -0700 (PDT) Received: (from darrenr@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id FAA50975; Thu, 26 Oct 2000 05:33:43 -0700 (PDT) (envelope-from darrenr@FreeBSD.org) Message-Id: <200010261233.FAA50975@freefall.freebsd.org> From: Darren Reed Date: Thu, 26 Oct 2000 05:33:43 -0700 (PDT) To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/sys/netinet fil.c ip_auth.h ip_compat.h ip_fil.c ip_frag.c ip_frag.h ip_ftp_pxy.c ip_nat.c ip_nat.h ip_raudio_pxy.c ip_state.c ip_state.h ipl.h mlfk_ipl.c X-FreeBSD-CVS-Branch: HEAD Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG darrenr 2000/10/26 05:33:43 PDT Modified files: sys/netinet fil.c ip_auth.h ip_compat.h ip_fil.c ip_frag.c ip_frag.h ip_ftp_pxy.c ip_nat.c ip_nat.h ip_raudio_pxy.c ip_state.c ip_state.h ipl.h mlfk_ipl.c Log: fix conflicts from rcsids Revision Changes Path 1.21 +46 -15 src/sys/netinet/fil.c 1.10 +1 -3 src/sys/netinet/ip_auth.h 1.11 +24 -14 src/sys/netinet/ip_compat.h 1.24 +30 -9 src/sys/netinet/ip_fil.c 1.13 +13 -10 src/sys/netinet/ip_frag.c 1.10 +2 -2 src/sys/netinet/ip_frag.h 1.15 +15 -9 src/sys/netinet/ip_ftp_pxy.c 1.18 +377 -62 src/sys/netinet/ip_nat.c 1.12 +10 -4 src/sys/netinet/ip_nat.h 1.6 +2 -2 src/sys/netinet/ip_raudio_pxy.c 1.18 +86 -58 src/sys/netinet/ip_state.c 1.10 +2 -1 src/sys/netinet/ip_state.h 1.12 +2 -2 src/sys/netinet/ipl.h 1.7 +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