From owner-cvs-all  Wed Aug 28  6:45:41 2002
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id B1C2537B400; Wed, 28 Aug 2002 06:45:36 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 62CD043E42; Wed, 28 Aug 2002 06:45:36 -0700 (PDT)
	(envelope-from darrenr@FreeBSD.org)
Received: from freefall.freebsd.org (darrenr@localhost [127.0.0.1])
	by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7SDjaJU077753;
	Wed, 28 Aug 2002 06:45:36 -0700 (PDT)
	(envelope-from darrenr@freefall.freebsd.org)
Received: (from darrenr@localhost)
	by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7SDjaNi077752;
	Wed, 28 Aug 2002 06:45:36 -0700 (PDT)
Message-Id: <200208281345.g7SDjaNi077752@freefall.freebsd.org>
From: Darren Reed <darrenr@FreeBSD.org>
Date: Wed, 28 Aug 2002 06:45:36 -0700 (PDT)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/contrib/ipfilter ipmon.c src/contrib/ipfilter/man
         ipmon.8
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     2002/08/28 06:45:36 PDT

  Modified files:
    contrib/ipfilter     ipmon.c 
    contrib/ipfilter/man ipmon.8 
  Log:
  merge the changes from 3.4.29 that didn't go cleanly due to conflicts
  
  Revision  Changes    Path
  1.15      +2 -2      src/contrib/ipfilter/ipmon.c
  1.11      +5 -2      src/contrib/ipfilter/man/ipmon.8

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