Date: Wed, 27 Jan 2010 12:03:56 -0500 From: John Baldwin <jhb@freebsd.org> To: Gavin Atkinson <gavin@freebsd.org> Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-8@freebsd.org Subject: Re: svn commit: r203074 - stable/8/usr.bin/calendar/calendars Message-ID: <201001271203.56836.jhb@freebsd.org> In-Reply-To: <1264606800.7054.8.camel@buffy.york.ac.uk> References: <201001271536.o0RFaJnN054904@svn.freebsd.org> <1264606800.7054.8.camel@buffy.york.ac.uk>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wednesday 27 January 2010 10:40:00 am Gavin Atkinson wrote: > On Wed, 2010-01-27 at 15:36 +0000, Gavin Atkinson wrote: > > Author: gavin > > Date: Wed Jan 27 15:36:19 2010 > > New Revision: 203074 > > URL: http://svn.freebsd.org/changeset/base/203074 > > > > Log: > > Merge r200318 from head: add myself to calendar.freebsd. > > Sorry, forgot: > > Approved by: ed (mentor, implicit) > > > Modified: > > stable/8/usr.bin/calendar/calendars/calendar.freebsd (contents, props changed) > > Directory Properties: > > stable/8/usr.bin/calendar/ (props changed) > > This mergeinfo issue appears to be related to a mismerge of r196252: > I've left it as it was. I've fixed it, thanks. -- John Baldwin
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001271203.56836.jhb>