From owner-cvs-all Wed Aug 28 6:35:11 2002 Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CD0E137B400; Wed, 28 Aug 2002 06:34:59 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 85ABC43E65; Wed, 28 Aug 2002 06:34:59 -0700 (PDT) (envelope-from darrenr@FreeBSD.org) Received: from freefall.freebsd.org (darrenr@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7SDYxJU076149; Wed, 28 Aug 2002 06:34:59 -0700 (PDT) (envelope-from darrenr@freefall.freebsd.org) Received: (from darrenr@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7SDYx2M076148; Wed, 28 Aug 2002 06:34:59 -0700 (PDT) Message-Id: <200208281334.g7SDYx2M076148@freefall.freebsd.org> From: Darren Reed Date: Wed, 28 Aug 2002 06:34:59 -0700 (PDT) To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/sys/contrib/ipfilter/netinet - Imported sources X-FreeBSD-CVS-Branch: DARRENR Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG darrenr 2002/08/28 06:34:59 PDT src/sys/contrib/ipfilter/netinet - Imported sources Update of /home/ncvs/src/sys/contrib/ipfilter/netinet In directory freefall.freebsd.org:/d/home/darrenr/sys-netinet Log Message: 3rd time lucky, i hope. Status: Vendor Tag: DARRENR Release Tags: v3-4-29 U src/sys/contrib/ipfilter/netinet/ip_auth.c U src/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c U src/sys/contrib/ipfilter/netinet/ip_netbios_pxy.c U src/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c C src/sys/contrib/ipfilter/netinet/ip_h323_pxy.c C src/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c C src/sys/contrib/ipfilter/netinet/ip_frag.h C src/sys/contrib/ipfilter/netinet/ip_frag.c U src/sys/contrib/ipfilter/netinet/ip_fil.h C src/sys/contrib/ipfilter/netinet/ip_fil.c C src/sys/contrib/ipfilter/netinet/ip_compat.h U src/sys/contrib/ipfilter/netinet/ip_auth.h U src/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c C src/sys/contrib/ipfilter/netinet/fil.c C src/sys/contrib/ipfilter/netinet/ip_state.c C src/sys/contrib/ipfilter/netinet/ip_proxy.h C src/sys/contrib/ipfilter/netinet/ip_proxy.c C src/sys/contrib/ipfilter/netinet/ip_nat.h C src/sys/contrib/ipfilter/netinet/ip_nat.c U src/sys/contrib/ipfilter/netinet/ip_log.c C src/sys/contrib/ipfilter/netinet/ip_state.h U src/sys/contrib/ipfilter/netinet/mlfk_ipl.c C src/sys/contrib/ipfilter/netinet/ipl.h I src/sys/contrib/ipfilter/netinet/src/CVS I src/sys/contrib/ipfilter/netinet/src/sys/CVS I src/sys/contrib/ipfilter/netinet/src/sys/contrib/CVS I src/sys/contrib/ipfilter/netinet/src/sys/contrib/ipfilter/CVS I src/sys/contrib/ipfilter/netinet/src/sys/contrib/ipfilter/netinet/CVS N src/sys/contrib/ipfilter/netinet/src/sys/contrib/ipfilter/netinet/IPFILTER.LICENCE N src/sys/contrib/ipfilter/netinet/src/sys/contrib/ipfilter/netinet/QNX_OCL.txt N src/sys/contrib/ipfilter/netinet/src/sys/contrib/ipfilter/netinet/fil.c N src/sys/contrib/ipfilter/netinet/src/sys/contrib/ipfilter/netinet/ip_auth.c N src/sys/contrib/ipfilter/netinet/src/sys/contrib/ipfilter/netinet/ip_auth.h N src/sys/contrib/ipfilter/netinet/src/sys/contrib/ipfilter/netinet/ip_compat.h N src/sys/contrib/ipfilter/netinet/src/sys/contrib/ipfilter/netinet/ip_fil.c N src/sys/contrib/ipfilter/netinet/src/sys/contrib/ipfilter/netinet/ip_fil.h N src/sys/contrib/ipfilter/netinet/src/sys/contrib/ipfilter/netinet/ip_frag.c N src/sys/contrib/ipfilter/netinet/src/sys/contrib/ipfilter/netinet/ip_frag.h N src/sys/contrib/ipfilter/netinet/src/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c N src/sys/contrib/ipfilter/netinet/src/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c N src/sys/contrib/ipfilter/netinet/src/sys/contrib/ipfilter/netinet/ip_log.c N src/sys/contrib/ipfilter/netinet/src/sys/contrib/ipfilter/netinet/ip_nat.c N src/sys/contrib/ipfilter/netinet/src/sys/contrib/ipfilter/netinet/ip_nat.h N src/sys/contrib/ipfilter/netinet/src/sys/contrib/ipfilter/netinet/ip_netbios_pxy.c N src/sys/contrib/ipfilter/netinet/src/sys/contrib/ipfilter/netinet/ip_proxy.c N src/sys/contrib/ipfilter/netinet/src/sys/contrib/ipfilter/netinet/ip_proxy.h N src/sys/contrib/ipfilter/netinet/src/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c N src/sys/contrib/ipfilter/netinet/src/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c N src/sys/contrib/ipfilter/netinet/src/sys/contrib/ipfilter/netinet/ip_state.c N src/sys/contrib/ipfilter/netinet/src/sys/contrib/ipfilter/netinet/ip_state.h N src/sys/contrib/ipfilter/netinet/src/sys/contrib/ipfilter/netinet/ipl.h N src/sys/contrib/ipfilter/netinet/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c 14 conflicts created by this import. Use the following command to help the merge: cvs checkout -jDARRENR:yesterday -jDARRENR src/sys/contrib/ipfilter/netinet To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message