From owner-cvs-all  Wed Jul 19  6:56:22 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 D198C37BE29; Wed, 19 Jul 2000 06:56:18 -0700 (PDT)
	(envelope-from darrenr@FreeBSD.org)
Received: (from darrenr@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id GAA26727;
	Wed, 19 Jul 2000 06:56:18 -0700 (PDT)
	(envelope-from darrenr@FreeBSD.org)
Message-Id: <200007191356.GAA26727@freefall.freebsd.org>
From: Darren Reed <darrenr@FreeBSD.org>
Date: Wed, 19 Jul 2000 06:56:18 -0700 (PDT)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/contrib/ipfilter fil.c ip_fil.h ip_log.c ipmon.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     2000/07/19 06:56:18 PDT

  Modified files:
    contrib/ipfilter     fil.c ip_fil.h ip_log.c ipmon.c 
    contrib/ipfilter/man ipfstat.8 
  Log:
  fix conflicts
  
  Revision  Changes    Path
  1.3       +25 -20    src/contrib/ipfilter/fil.c
  1.3       +3 -3      src/contrib/ipfilter/ip_fil.h
  1.3       +6 -2      src/contrib/ipfilter/ip_log.c
  1.7       +7 -3      src/contrib/ipfilter/ipmon.c
  1.5       +5 -3      src/contrib/ipfilter/man/ipfstat.8



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