From owner-cvs-all  Sat Jul 28  4:58:35 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 C1E8637B403; Sat, 28 Jul 2001 04:58:31 -0700 (PDT)
	(envelope-from darrenr@FreeBSD.org)
Received: (from darrenr@localhost)
	by freefall.freebsd.org (8.11.4/8.11.4) id f6SBwV351553;
	Sat, 28 Jul 2001 04:58:31 -0700 (PDT)
	(envelope-from darrenr)
Message-Id: <200107281158.f6SBwV351553@freefall.freebsd.org>
From: Darren Reed <darrenr@FreeBSD.org>
Date: Sat, 28 Jul 2001 04:58:31 -0700 (PDT)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/sys/contrib/ipfilter/netinet fil.c ip_auth.c
         ip_auth.h ip_compat.h ip_fil.c ip_fil.h ip_frag.c ip_frag.h
         ip_ftp_pxy.c ip_log.c ip_nat.c ip_nat.h ip_proxy.c ip_proxy.h
         ip_raudio_pxy.c ip_state.c ip_state.h ipl.h
X-FreeBSD-CVS-Branch: HEAD
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
List-ID: <cvs-all.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20cvs-all>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20cvs-all>
X-Loop: FreeBSD.ORG

darrenr     2001/07/28 04:58:30 PDT

  Modified files:
    sys/contrib/ipfilter/netinet fil.c ip_auth.c ip_auth.h 
                                 ip_compat.h ip_fil.c ip_fil.h 
                                 ip_frag.c ip_frag.h ip_ftp_pxy.c 
                                 ip_log.c ip_nat.c ip_nat.h 
                                 ip_proxy.c ip_proxy.h 
                                 ip_raudio_pxy.c ip_state.c 
                                 ip_state.h ipl.h 
  Log:
  fix conflicts created by import
  
  Revision  Changes    Path
  1.24      +76 -60    src/sys/contrib/ipfilter/netinet/fil.c
  1.22      +152 -65   src/sys/contrib/ipfilter/netinet/ip_auth.c
  1.11      +5 -8      src/sys/contrib/ipfilter/netinet/ip_auth.h
  1.14      +60 -37    src/sys/contrib/ipfilter/netinet/ip_compat.h
  1.26      +149 -65   src/sys/contrib/ipfilter/netinet/ip_fil.c
  1.19      +17 -12    src/sys/contrib/ipfilter/netinet/ip_fil.h
  1.16      +60 -17    src/sys/contrib/ipfilter/netinet/ip_frag.c
  1.13      +6 -5      src/sys/contrib/ipfilter/netinet/ip_frag.h
  1.18      +89 -21    src/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c
  1.18      +20 -47    src/sys/contrib/ipfilter/netinet/ip_log.c
  1.23      +89 -67    src/sys/contrib/ipfilter/netinet/ip_nat.c
  1.16      +20 -12    src/sys/contrib/ipfilter/netinet/ip_nat.h
  1.12      +22 -13    src/sys/contrib/ipfilter/netinet/ip_proxy.c
  1.10      +5 -6      src/sys/contrib/ipfilter/netinet/ip_proxy.h
  1.8       +14 -8     src/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c
  1.22      +43 -30    src/sys/contrib/ipfilter/netinet/ip_state.c
  1.11      +9 -7      src/sys/contrib/ipfilter/netinet/ip_state.h
  1.15      +4 -6      src/sys/contrib/ipfilter/netinet/ipl.h


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