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: Merging bug fixes for Org Date: Wed, 16 May 2012 19:10:31 +0200 Organization: GNU Message-ID: <87ehqkvypk.fsf@gnu.org> References: <87zk9819v4.fsf@gnu.org> <45ehqkrt3x.fsf@fencepost.gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1337188193 24850 80.91.229.3 (16 May 2012 17:09:53 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 16 May 2012 17:09:53 +0000 (UTC) Cc: emacs-devel@gnu.org To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed May 16 19:09:53 2012 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1SUhjP-0002tn-1E for ged-emacs-devel@m.gmane.org; Wed, 16 May 2012 19:09:47 +0200 Original-Received: from localhost ([::1]:50942 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SUhjO-0003tv-Bv for ged-emacs-devel@m.gmane.org; Wed, 16 May 2012 13:09:46 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:54585) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SUhjL-0003tp-Ke for emacs-devel@gnu.org; Wed, 16 May 2012 13:09:44 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SUhjJ-0006bX-Hi for emacs-devel@gnu.org; Wed, 16 May 2012 13:09:43 -0400 Original-Received: from mail-we0-f169.google.com ([74.125.82.169]:53916) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SUhjJ-0006aY-8A; Wed, 16 May 2012 13:09:41 -0400 Original-Received: by wefh52 with SMTP id h52so819037wef.0 for ; Wed, 16 May 2012 10:09:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=sender:from:to:cc:subject:in-reply-to:organization:references :user-agent:date:message-id:mime-version:content-type; bh=mlarc4VouJBq9IMtfyGtm4e1Ey0BfBDrXn4YOplvyJs=; b=LeniC1cNLpAjt0UeMGkSXUMgTyDzfW4zkknWr7HjiwL+R9sZih+sjcLasNUwKMzPNw xaL+vgUYt1IbbwOdwYrhlJOXbIhM1TgyfjDz9Ou9My4ASOJyI6ReYvpPvt6WPYQsmv8J /XtsG0hgCTDwdV1GelaiK1GcwI4fEzjhKmeuKZ2nRBo7J+n9+eW+XAFidDOuQep6rtQG juYsO1vXLJjjM1hrZLcyltd6X8p53y4/7WLm2ZrZ00z6OJtwMCvNbNicgVdB5zq5dtTY FUQRA6pp0g0pSgnu6IWg34M9Ppsy8IXMWPKawRZ3NOtMan9nAn9eOBAvHheckBhSUh1b IUYQ== Original-Received: by 10.216.150.166 with SMTP id z38mr2546140wej.78.1337188177369; Wed, 16 May 2012 10:09:37 -0700 (PDT) Original-Received: from myhost.localdomain (pha75-11-82-236-86-204.fbx.proxad.net. [82.236.86.204]) by mx.google.com with ESMTPS id bn9sm50553306wib.5.2012.05.16.10.09.35 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 16 May 2012 10:09:36 -0700 (PDT) Original-Received: by myhost.localdomain (Postfix, from userid 1000) id 1E70486F9; Wed, 16 May 2012 19:10:31 +0200 (CEST) In-Reply-To: <45ehqkrt3x.fsf@fencepost.gnu.org> (Glenn Morris's message of "Wed, 16 May 2012 12:25:06 -0400") User-Agent: Gnus/5.130006 (Ma Gnus v0.6) Emacs/24.1.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 74.125.82.169 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:150530 Archived-At: Glenn Morris writes: > Bastien wrote: > >> -@dircategory Emacs editing modes >> +@dircategory Emacs > > You are overwriting my change. Sorry for this. Fixed in Org's repo. I double-checked and there is no other mistake. Can I go ahead? -- Bastien