From owner-cvs-all  Thu Oct 26  5:47:44 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 6AB7037B479; Thu, 26 Oct 2000 05:47:41 -0700 (PDT)
Received: (from darrenr@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id FAA56376;
	Thu, 26 Oct 2000 05:47:41 -0700 (PDT)
	(envelope-from darrenr@FreeBSD.org)
Message-Id: <200010261247.FAA56376@freefall.freebsd.org>
From: Darren Reed <darrenr@FreeBSD.org>
Date: Thu, 26 Oct 2000 05:47:41 -0700 (PDT)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/contrib/ipfilter fil.c ipmon.c
         src/contrib/ipfilter/man ipf.4 ipf.5 ipmon.8 ipnat.4
X-FreeBSD-CVS-Branch: HEAD
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

darrenr     2000/10/26 05:47:41 PDT

  Modified files:
    contrib/ipfilter     fil.c ipmon.c 
    contrib/ipfilter/man ipf.4 ipf.5 ipmon.8 ipnat.4 
  Log:
  fix conflicts from rcsids
  
  Revision  Changes    Path
  1.5       +46 -15    src/contrib/ipfilter/fil.c
  1.10      +2 -2      src/contrib/ipfilter/ipmon.c
  1.5       +16 -16    src/contrib/ipfilter/man/ipf.4
  1.5       +3 -3      src/contrib/ipfilter/man/ipf.5
  1.8       +2 -2      src/contrib/ipfilter/man/ipmon.8
  1.5       +5 -3      src/contrib/ipfilter/man/ipnat.4



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