Date: Mon, 6 Jan 2003 04:39:29 +0200 From: Giorgos Keramidas <keramida@FreeBSD.org> To: Tom Rhodes <trhodes@FreeBSD.org> Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/contrib/lukemftpd/src ftpd.conf.5 ftpusers.5 Message-ID: <20030106023929.GA4285@gothmog.gr> In-Reply-To: <20030105192316.678fa230.trhodes@FreeBSD.org> References: <200301060020.h060KQAw059225@repoman.freebsd.org> <20030105192316.678fa230.trhodes@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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. - Giorgos 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?20030106023929.GA4285>