From owner-cvs-all Thu Jan 13 11:44:38 2000 Delivered-To: cvs-all@freebsd.org Received: from overcee.netplex.com.au (overcee.netplex.com.au [202.12.86.7]) by hub.freebsd.org (Postfix) with ESMTP id A88BE14F0C; Thu, 13 Jan 2000 11:44:33 -0800 (PST) (envelope-from peter@netplex.com.au) Received: from netplex.com.au (localhost [127.0.0.1]) by overcee.netplex.com.au (Postfix) with ESMTP id BCE691CA0; Fri, 14 Jan 2000 03:44:31 +0800 (WST) (envelope-from peter@netplex.com.au) X-Mailer: exmh version 2.1.1 10/15/1999 To: Guido van Rooij Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/contrib/ipfilter HISTORY fil.c fils.c ip_compat.h ip_fil.c ip_fil.h ip_frag.c ip_ftp_pxy.c ip_nat.c ip_nat.h ip_sfil.c ip_state.c ipl.h ipmon.c ipnat.c parse.c solaris.c todo src/contrib/ipfilter/iplang iplang_y.y src/contrib/ipfilter/ipsend ... In-Reply-To: Message from Guido van Rooij of "Thu, 13 Jan 2000 10:36:21 PST." <200001131836.KAA34085@freefall.freebsd.org> Date: Fri, 14 Jan 2000 03:44:31 +0800 From: Peter Wemm Message-Id: <20000113194431.BCE691CA0@overcee.netplex.com.au> Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk Guido van Rooij wrote: > guido 2000/01/13 10:36:21 PST > > Modified files: > contrib/ipfilter HISTORY fil.c fils.c ip_compat.h ip_fil.c > ip_fil.h ip_frag.c ip_ftp_pxy.c ip_nat.c > ip_nat.h ip_sfil.c ip_state.c ipl.h > ipmon.c ipnat.c parse.c solaris.c todo > Log: > Merge `conflicts' (I'd rather have the head restored to the vendor branch) I've figured out how to do this, but it's still going to require merges on a handful of files. I'd back out the blasted "spelling fixes" and put the man pages back onto the vendor branch, but they ended up on a release. :-( Cheers, -Peter -- Peter Wemm - peter@FreeBSD.org; peter@yahoo-inc.com; peter@netplex.com.au "All of this is for nothing if we don't go to the stars" - JMS/B5 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message