From owner-cvs-all  Tue May 23 21:40:24 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 6F61537BBC6; Tue, 23 May 2000 21:40:18 -0700 (PDT)
	(envelope-from darrenr@FreeBSD.org)
Received: (from darrenr@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id VAA28818;
	Tue, 23 May 2000 21:40:18 -0700 (PDT)
	(envelope-from darrenr@FreeBSD.org)
Message-Id: <200005240440.VAA28818@freefall.freebsd.org>
From: Darren Reed <darrenr@FreeBSD.org>
Date: Tue, 23 May 2000 21:40:18 -0700 (PDT)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/sys/netinet fil.c ip_auth.c ip_compat.h
         ip_ftp_pxy.c ip_log.c ip_nat.c ip_nat.h ip_raudio_pxy.c
         ip_rcmd_pxy.c ipl.h mlfk_ipl.c
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

darrenr     2000/05/23 21:40:18 PDT

  Modified files:
    sys/netinet          fil.c ip_auth.c ip_compat.h ip_ftp_pxy.c 
                         ip_log.c ip_nat.c ip_nat.h 
                         ip_raudio_pxy.c ip_rcmd_pxy.c ipl.h 
                         mlfk_ipl.c 
  Log:
  fix up conflicts
  
  Revision  Changes    Path
  1.16      +2 -2      src/sys/netinet/fil.c
  1.16      +2 -1      src/sys/netinet/ip_auth.c
  1.9       +187 -37   src/sys/netinet/ip_compat.h
  1.12      +408 -111  src/sys/netinet/ip_ftp_pxy.c
  1.14      +14 -13    src/sys/netinet/ip_log.c
  1.15      +2 -1      src/sys/netinet/ip_nat.c
  1.10      +2 -1      src/sys/netinet/ip_nat.h
  1.5       +15 -11    src/sys/netinet/ip_raudio_pxy.c
  1.5       +10 -1     src/sys/netinet/ip_rcmd_pxy.c
  1.9       +3 -3      src/sys/netinet/ipl.h
  1.5       +4 -3      src/sys/netinet/mlfk_ipl.c



To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message