Date: Mon, 6 Jan 2003 11:22:31 +0000 From: Ceri Davies <setantae@submonkey.net> To: Giorgos Keramidas <keramida@FreeBSD.org> Cc: Tom Rhodes <trhodes@FreeBSD.org>, cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/contrib/lukemftpd/src ftpd.conf.5 ftpusers.5 Message-ID: <20030106112231.GA2944@submonkey.net> In-Reply-To: <20030106023929.GA4285@gothmog.gr> References: <200301060020.h060KQAw059225@repoman.freebsd.org> <20030105192316.678fa230.trhodes@FreeBSD.org> <20030106023929.GA4285@gothmog.gr>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, Jan 06, 2003 at 04:39:29AM +0200, Giorgos Keramidas wrote: > On 2003-01-05 19:23, Tom Rhodes <trhodes@FreeBSD.ORG> wrote: > > On Sun, 5 Jan 2003 16:20:26 -0800 (PST) obrien@FreeBSD.org wrote: > > > Merge our .Nm changes into the nbsd_20030105 import. > > > > > > Revision Changes Path > > > 1.3 +137 -41 src/contrib/lukemftpd/src/ftpd.conf.5 > > > 1.3 +3 -1 src/contrib/lukemftpd/src/ftpusers.5 > > > > Does this close PR: docs/45590? > > No. It only moves the $FreeBSD$ rcs id line to a more appropriate > place, and resolves the conflicts created when I took the files off > the vendor branch. Since these are now taken out of the LUKEM vendor > branch you are free to make changes to the files that will close the > PR after making sure David has no objections. See also bin/44519 which is similar, if not the same as, docs/45590. Ceri -- The wrath of the heroic dwarves is now! 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?20030106112231.GA2944>