From owner-cvs-all  Sun Feb  4  6:27:21 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 61BC437B401; Sun,  4 Feb 2001 06:26:57 -0800 (PST)
Received: (from darrenr@localhost)
	by freefall.freebsd.org (8.11.1/8.11.1) id f14EQv031702;
	Sun, 4 Feb 2001 06:26:57 -0800 (PST)
	(envelope-from darrenr)
Message-Id: <200102041426.f14EQv031702@freefall.freebsd.org>
From: Darren Reed <darrenr@FreeBSD.org>
Date: Sun, 4 Feb 2001 06:26:57 -0800 (PST)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/contrib/ipfilter fil.c ip_fil.h ipmon.c
         src/contrib/ipfilter/ipsend ipsend.c sock.c
         src/contrib/ipfilter/man ipfstat.8
X-FreeBSD-CVS-Branch: HEAD
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

darrenr     2001/02/04 06:26:57 PST

  Modified files:
    contrib/ipfilter     fil.c ip_fil.h ipmon.c 
    contrib/ipfilter/ipsend ipsend.c sock.c 
    contrib/ipfilter/man ipfstat.8 
  Log:
  fix conflicts
  
  Revision  Changes    Path
  1.7       +71 -14    src/contrib/ipfilter/fil.c
  1.4       +4 -1      src/contrib/ipfilter/ip_fil.h
  1.11      +12 -2     src/contrib/ipfilter/ipmon.c
  1.6       +8 -2      src/contrib/ipfilter/ipsend/ipsend.c
  1.5       +2 -2      src/contrib/ipfilter/ipsend/sock.c
  1.6       +13 -5     src/contrib/ipfilter/man/ipfstat.8



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