From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: merge conlict? Date: Mon, 25 Jan 2010 13:38:04 +0100 Message-ID: References: <83vdeq634g.fsf@gnu.org> <87sk9ufmgd.fsf@mithlond.arda> <83k4v65r51.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1264424352 4951 80.91.229.12 (25 Jan 2010 12:59:12 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 25 Jan 2010 12:59:12 +0000 (UTC) Cc: Teemu Likonen , emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 25 13:38:28 2010 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1NZOD5-0001Ql-Ou for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 13:38:28 +0100 Original-Received: from localhost ([127.0.0.1]:50049 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZOD6-0007Xk-W9 for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 07:38:29 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZOCr-0007Rw-IM for emacs-devel@gnu.org; Mon, 25 Jan 2010 07:38:13 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZOCm-0007Pw-A3 for emacs-devel@gnu.org; Mon, 25 Jan 2010 07:38:12 -0500 Original-Received: from [199.232.76.173] (port=47154 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZOCm-0007Pt-7B for emacs-devel@gnu.org; Mon, 25 Jan 2010 07:38:08 -0500 Original-Received: from mail-out.m-online.net ([212.18.0.9]:45496) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NZOCk-0005Us-Hm; Mon, 25 Jan 2010 07:38:06 -0500 Original-Received: from mail01.m-online.net (mail.m-online.net [192.168.3.149]) by mail-out.m-online.net (Postfix) with ESMTP id C66DF1C1541C; Mon, 25 Jan 2010 13:38:05 +0100 (CET) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.8.164]) by mail.m-online.net (Postfix) with ESMTP id BBFAC90053; Mon, 25 Jan 2010 13:38:05 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Original-Received: from mail.mnet-online.de ([192.168.3.149]) by localhost (dynscan1.mnet-online.de [192.168.8.164]) (amavisd-new, port 10024) with ESMTP id 9zUPBdSrzIyT; Mon, 25 Jan 2010 13:38:04 +0100 (CET) Original-Received: from igel.home (DSL01.83.171.176.225.ip-pool.NEFkom.net [83.171.176.225]) by mail.mnet-online.de (Postfix) with ESMTP; Mon, 25 Jan 2010 13:38:04 +0100 (CET) Original-Received: by igel.home (Postfix, from userid 501) id 73B04CA298; Mon, 25 Jan 2010 13:38:04 +0100 (CET) X-Yow: MMM-MM!! So THIS is BIO-NEBULATION! In-Reply-To: <83k4v65r51.fsf@gnu.org> (Eli Zaretskii's message of "Mon, 25 Jan 2010 14:02:34 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:120360 Eli Zaretskii writes: > I clearly see here changes not made by Mark, Of course not, since it's just a merge of trunk. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."