From owner-cvs-all  Sat Aug 12 21:31:11 2000
Delivered-To: cvs-all@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
	by hub.freebsd.org (Postfix) with ESMTP
	id E13AA37B535; Sat, 12 Aug 2000 21:31:06 -0700 (PDT)
	(envelope-from darrenr@FreeBSD.org)
Received: (from darrenr@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id VAA75777;
	Sat, 12 Aug 2000 21:31:06 -0700 (PDT)
	(envelope-from darrenr@FreeBSD.org)
Message-Id: <200008130431.VAA75777@freefall.freebsd.org>
From: Darren Reed <darrenr@FreeBSD.org>
Date: Sat, 12 Aug 2000 21:31:06 -0700 (PDT)
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
X-FreeBSD-CVS-Branch: HEAD
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

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