From owner-svn-src-stable@FreeBSD.ORG Wed Jan 27 17:04:15 2010 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D9AD01065670; Wed, 27 Jan 2010 17:04:15 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id AA40C8FC26; Wed, 27 Jan 2010 17:04:15 +0000 (UTC) Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net [66.111.2.69]) by cyrus.watson.org (Postfix) with ESMTPSA id 3499046B2E; Wed, 27 Jan 2010 12:04:15 -0500 (EST) Received: from jhbbsd.localnet (smtp.hudson-trading.com [209.249.190.9]) by bigwig.baldwin.cx (Postfix) with ESMTPA id 6C99C8A01F; Wed, 27 Jan 2010 12:04:14 -0500 (EST) From: John Baldwin To: Gavin Atkinson Date: Wed, 27 Jan 2010 12:03:56 -0500 User-Agent: KMail/1.12.1 (FreeBSD/7.2-CBSD-20100120; KDE/4.3.1; amd64; ; ) References: <201001271536.o0RFaJnN054904@svn.freebsd.org> <1264606800.7054.8.camel@buffy.york.ac.uk> In-Reply-To: <1264606800.7054.8.camel@buffy.york.ac.uk> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <201001271203.56836.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.0.1 (bigwig.baldwin.cx); Wed, 27 Jan 2010 12:04:14 -0500 (EST) X-Virus-Scanned: clamav-milter 0.95.1 at bigwig.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-2.6 required=4.2 tests=AWL,BAYES_00 autolearn=ham version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bigwig.baldwin.cx 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 X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Jan 2010 17:04:16 -0000 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