Date: Sun, 29 Jul 2001 10:08:13 +0930 From: Greg Lehey <grog@FreeBSD.org> To: Darren Reed <darrenr@FreeBSD.org> Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sys/contrib/ipfilter/netinet fil.c ip_auth.c ip_auth.h ip_compat.h ip_fil.c ip_fil.h ip_frag.c ip_frag.h ip_ftp_pxy.c ip_log.c ip_nat.c ip_nat.h ip_proxy.c ip_proxy.h ip_raudio_pxy.c ip_state.c ip_state.h ipl.h Message-ID: <20010729100813.C68202@wantadilla.lemis.com> In-Reply-To: <200107281158.f6SBwV351553@freefall.freebsd.org>; from darrenr@FreeBSD.org on Sat, Jul 28, 2001 at 04:58:31AM -0700 References: <200107281158.f6SBwV351553@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Saturday, 28 July 2001 at 4:58:31 -0700, Darren Reed wrote: > darrenr 2001/07/28 04:58:30 PDT > > Modified files: > sys/contrib/ipfilter/netinet fil.c ip_auth.c ip_auth.h > ip_compat.h ip_fil.c ip_fil.h > ip_frag.c ip_frag.h ip_ftp_pxy.c > ip_log.c ip_nat.c ip_nat.h > ip_proxy.c ip_proxy.h > ip_raudio_pxy.c ip_state.c > ip_state.h ipl.h > Log: > fix conflicts created by import Could you describe these "conflicts"? I estimate about 1000 lines of changes. Last time I looked at a commit like this, it consisted mainly of bug fixes. It would be nice to know what has been fixed, especially in a security-related product. Greg -- See complete headers for address and phone numbers To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20010729100813.C68202>