From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Bastien Newsgroups: gmane.emacs.devel Subject: Re: Merged Org 7.7 Date: Thu, 18 Aug 2011 09:52:47 +0200 Message-ID: <87bovncg1c.fsf@gnu.org> References: <87k4b2wgff.fsf@gnu.org> <0gmxfmtf4o.fsf@fencepost.gnu.org> <87k4aewwcb.fsf@gnu.org> <87zkjatgab.fsf@gnu.org> <5yfwkz9apa.fsf@fencepost.gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1313653938 9372 80.91.229.12 (18 Aug 2011 07:52:18 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 18 Aug 2011 07:52:18 +0000 (UTC) Cc: emacs-devel@gnu.org To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Aug 18 09:52:13 2011 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([140.186.70.17]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1QtxOf-0008SG-8f for ged-emacs-devel@m.gmane.org; Thu, 18 Aug 2011 09:52:13 +0200 Original-Received: from localhost ([::1]:41505 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QtxOe-0006Zu-5U for ged-emacs-devel@m.gmane.org; Thu, 18 Aug 2011 03:52:12 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:53879) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QtxOc-0006Zn-D3 for emacs-devel@gnu.org; Thu, 18 Aug 2011 03:52:11 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QtxOb-0007vI-BK for emacs-devel@gnu.org; Thu, 18 Aug 2011 03:52:10 -0400 Original-Received: from mail-ww0-f49.google.com ([74.125.82.49]:58015) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QtxOb-0007vD-5o; Thu, 18 Aug 2011 03:52:09 -0400 Original-Received: by wwf10 with SMTP id 10so1404004wwf.30 for ; Thu, 18 Aug 2011 00:52:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=sender:from:to:cc:subject:in-reply-to:references:user-agent:date :message-id:mime-version:content-type; bh=XGWJ2KlkBFofsayc4nEvENyF2uI/65lCg0PHBKIuuzQ=; b=iJim/Xag1umCziqRtUprhrQ0w8OBBYXUmMYtvAlZl0hUhq/zqH86/9TNYKGCWkFx5U JcSt5b+QKU2bIj7BgQkY0WxlLyJHEvViXPcvj1YeTiyos/HoQzl2WYb8I64cFafMEP34 01NG2bv1vshWCKfFmPTA6pgBw11um43Mi5kUk= Original-Received: by 10.216.88.212 with SMTP id a62mr325368wef.43.1313653928092; Thu, 18 Aug 2011 00:52:08 -0700 (PDT) Original-Received: from myhost.localdomain (95.152.71.86.rev.sfr.net [86.71.152.95]) by mx.google.com with ESMTPS id n40sm1283748weq.36.2011.08.18.00.52.05 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 18 Aug 2011 00:52:06 -0700 (PDT) Original-Received: by myhost.localdomain (Postfix, from userid 1000) id 3AAA2604B; Thu, 18 Aug 2011 09:52:47 +0200 (CEST) In-Reply-To: <5yfwkz9apa.fsf@fencepost.gnu.org> (Glenn Morris's message of "Wed, 17 Aug 2011 14:04:01 -0400") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 74.125.82.49 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:143400 Archived-At: Glenn Morris writes: > Bastien wrote: > >>> http://lists.gnu.org/archive/html/emacs-diffs/2011-08/msg00062.html >>> http://lists.gnu.org/archive/html/emacs-diffs/2011-01/msg00156.html >> >> These emails are not the one about _your_ change, or do I miss >> something? > > Yes, the change to copyright years was made in the emacs-23 branch by > me, then merged to trunk by Stefan, so I believe the last one represents > the relevant change. Ah, thanks. It was hard to tell, because the subject of the email ("Merge from...") was not describing the change, and the content of the email didn't let me spot it. > But perhaps I made other smaller changes after that > to correct issues, I cannot remember. Carsten and I have been carefully watching emacs-diffs so far, so I am pretty confident the Org git repo contains changes from Emacs. Thanks again for your close attention to these problems! Best, -- Bastien