From owner-cvs-all  Sun Feb  4  6:24:57 2001
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 C6F7E37B401; Sun,  4 Feb 2001 06:24:32 -0800 (PST)
Received: (from darrenr@localhost)
	by freefall.freebsd.org (8.11.1/8.11.1) id f14EOWL31289;
	Sun, 4 Feb 2001 06:24:32 -0800 (PST)
	(envelope-from darrenr)
Message-Id: <200102041424.f14EOWL31289@freefall.freebsd.org>
From: Darren Reed <darrenr@FreeBSD.org>
Date: Sun, 4 Feb 2001 06:24:32 -0800 (PST)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/sys/netinet fil.c ip_auth.c ip_compat.h ip_fil.h
         ip_frag.c ip_frag.h ip_ftp_pxy.c ip_nat.c ip_nat.h ip_proxy.h
         ip_rcmd_pxy.c ip_state.c ipl.h mlfk_ipl.c
X-FreeBSD-CVS-Branch: HEAD
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

darrenr     2001/02/04 06:24:32 PST

  Modified files:
    sys/netinet          fil.c ip_auth.c ip_compat.h ip_fil.h 
                         ip_frag.c ip_frag.h ip_ftp_pxy.c ip_nat.c 
                         ip_nat.h ip_proxy.h ip_rcmd_pxy.c 
                         ip_state.c ipl.h mlfk_ipl.c 
  Log:
  fix conflicts
  
  Revision  Changes    Path
  1.23      +72 -15    src/sys/netinet/fil.c
  1.21      +2 -2      src/sys/netinet/ip_auth.c
  1.13      +17 -5     src/sys/netinet/ip_compat.h
  1.18      +5 -2      src/sys/netinet/ip_fil.h
  1.14      +10 -12    src/sys/netinet/ip_frag.c
  1.11      +3 -2      src/sys/netinet/ip_frag.h
  1.17      +22 -9     src/sys/netinet/ip_ftp_pxy.c
  1.20      +99 -55    src/sys/netinet/ip_nat.c
  1.14      +6 -5      src/sys/netinet/ip_nat.h
  1.9       +3 -2      src/sys/netinet/ip_proxy.h
  1.8       +3 -3      src/sys/netinet/ip_rcmd_pxy.c
  1.20      +11 -13    src/sys/netinet/ip_state.c
  1.14      +2 -2      src/sys/netinet/ipl.h
  1.8       +13 -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