From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bastien Subject: Re: Merge org-7.7 into emacs Date: Mon, 15 Aug 2011 16:35:18 +0200 Message-ID: <87hb5iyc7t.fsf@gnu.org> References: <87hb5tun28.fsf@mean.albasani.net> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([140.186.70.92]:57319) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QsyFW-0008Ew-Gp for emacs-orgmode@gnu.org; Mon, 15 Aug 2011 10:34:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QsyFV-0007S9-AC for emacs-orgmode@gnu.org; Mon, 15 Aug 2011 10:34:42 -0400 Received: from mail-ww0-f49.google.com ([74.125.82.49]:35056) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QsyFV-0007Rv-1O for emacs-orgmode@gnu.org; Mon, 15 Aug 2011 10:34:41 -0400 Received: by wwf10 with SMTP id 10so3877712wwf.30 for ; Mon, 15 Aug 2011 07:34:40 -0700 (PDT) In-Reply-To: (Ethan Ligon's message of "Sun, 7 Aug 2011 18:59:38 +0000 (UTC)") List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Ethan Ligon Cc: emacs-orgmode@gnu.org Hi Ethan, Ethan Ligon writes: > I'm afraid I'm mentioned twice. The first has to do with copyright > assignment; I've begun the process described in org-contribute.org > to assign copyright to the FSF. Thanks -- the contribution was small enough this time, I marked it as "(tiny change)" in the Emacs ChangeLog. > The second has to do with an incomplete ChangeLog entry for one of my > patches (commit 49e6bc899758114d6d29e69a8f9e40798d26782b). I don't > know the best to clean this up, since the ChangeLog is derived from > the git log. But here's a ChangeLog entry that I think would have been > valid: I've committed the updated ChangeLog in Emacs trunk. Thanks for this! -- Bastien