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: Org merge Date: Tue, 12 Nov 2013 14:17:30 +0100 Message-ID: <87wqkd3gk5.fsf@bzg.ath.cx> References: <8738n5cijg.fsf@bzg.ath.cx> <87vc0016yy.fsf@bzg.ath.cx> <87iow0p1n1.fsf@gmail.com> <87bo1s14yr.fsf@bzg.ath.cx> <87li0vvqay.fsf@bzg.ath.cx> <87d2m6g4ba.fsf@bzg.ath.cx> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1384262262 14304 80.91.229.3 (12 Nov 2013 13:17:42 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 12 Nov 2013 13:17:42 +0000 (UTC) Cc: Jambunathan K , emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Nov 12 14:17:46 2013 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 1VgDqk-0007L3-Jt for ged-emacs-devel@m.gmane.org; Tue, 12 Nov 2013 14:17:46 +0100 Original-Received: from localhost ([::1]:42777 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VgDqj-0008Dd-Vx for ged-emacs-devel@m.gmane.org; Tue, 12 Nov 2013 08:17:45 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33013) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VgDqd-0008DU-Ce for emacs-devel@gnu.org; Tue, 12 Nov 2013 08:17:44 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VgDqY-0004y5-Mb for emacs-devel@gnu.org; Tue, 12 Nov 2013 08:17:39 -0500 Original-Received: from mail-wi0-x22a.google.com ([2a00:1450:400c:c05::22a]:49604) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VgDqY-0004xx-Dh for emacs-devel@gnu.org; Tue, 12 Nov 2013 08:17:34 -0500 Original-Received: by mail-wi0-f170.google.com with SMTP id m19so3716730wiv.3 for ; Tue, 12 Nov 2013 05:17:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:in-reply-to:references:user-agent:date :message-id:mime-version:content-type; bh=KyaiHuOoJ8D7370dCrDHQqLprdCls2grPuZGdusR/yo=; b=Vyyr90JaZQ3CE95tZSMMbSFkCcCvwdK5Wg1aFGrIjiS2NwysP3HEr1MC4UcIrXQAXh XzKdawK8BPA80V+i2lHoa4vDj0GHOx5KjBtfJBXnuz3nfZD555dE+KsA6Zx+S4HXdLDa Ld96tZpq0H+97PM0jqrMZgQvfbPCu8MXp2tJ1Wx0khL0sQwaCDZzeP5Ek0AD+4H6mn/b frAcYF32cgRcUoo7A4Ost9OecARPZGkSs74OEeZ9MAOEYs44WcQYHNWnE1K9CNdP8NUT FmA1+LwDXZMlMSFu+qnVvX18kWO6ztntgb2SNTNjCqELjBWEHtcZPAPQuIm9bZHGPI/0 DgEg== X-Received: by 10.180.11.166 with SMTP id r6mr16439525wib.9.1384262253576; Tue, 12 Nov 2013 05:17:33 -0800 (PST) Original-Received: from bzg.localdomain (vol75-5-82-226-35-66.fbx.proxad.net. [82.226.35.66]) by mx.google.com with ESMTPSA id dn2sm44429841wid.1.2013.11.12.05.17.31 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Nov 2013 05:17:32 -0800 (PST) Original-Received: by bzg.localdomain (Postfix, from userid 1000) id 4DF121C20081; Tue, 12 Nov 2013 14:17:30 +0100 (CET) In-Reply-To: <87d2m6g4ba.fsf@bzg.ath.cx> (Bastien's message of "Mon, 11 Nov 2013 19:51:21 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c05::22a 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:165202 Archived-At: Bastien writes: > http://bzg.fr/u/emacs_org_diff_11112013.patch.txt I merged Org 8.2.3a into Emacs -- now you can fire back with proofreading and the usual clean up... hope there is not a lot. Thanks! -- Bastien