From owner-cvs-all  Sun Oct 29  0:53:10 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 5F50B37B479; Sun, 29 Oct 2000 00:53:06 -0700 (PDT)
Received: (from darrenr@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id AAA02696;
	Sun, 29 Oct 2000 00:53:06 -0700 (PDT)
	(envelope-from darrenr@FreeBSD.org)
Message-Id: <200010290753.AAA02696@freefall.freebsd.org>
From: Darren Reed <darrenr@FreeBSD.org>
Date: Sun, 29 Oct 2000 00:53:06 -0700 (PDT)
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
X-FreeBSD-CVS-Branch: HEAD
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

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