From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!not-for-mail
From: Eli Zaretskii <eliz@gnu.org>
Newsgroups: gmane.emacs.devel
Subject: Re: merge conlict?
Date: Thu, 28 Jan 2010 06:03:22 +0200
Message-ID: <83d40u5111.fsf@gnu.org>
References: <E1NZJ1t-00089o-ST@monty-python.gnu.org> <83vdeq634g.fsf@gnu.org>
	<b4m8wbjasio.fsf@jpl.org>
Reply-To: Eli Zaretskii <eliz@gnu.org>
NNTP-Posting-Host: lo.gmane.org
X-Trace: ger.gmane.org 1264651448 14809 80.91.229.12 (28 Jan 2010 04:04:08 GMT)
X-Complaints-To: usenet@ger.gmane.org
NNTP-Posting-Date: Thu, 28 Jan 2010 04:04:08 +0000 (UTC)
Cc: emacs-devel@gnu.org
To: Katsumi Yamaoka <yamaoka@jpl.org>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jan 28 05:04:05 2010
Return-path: <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>
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.69)
	(envelope-from <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1NaLbu-0006oN-QG
	for ged-emacs-devel@m.gmane.org; Thu, 28 Jan 2010 05:04:02 +0100
Original-Received: from localhost ([127.0.0.1]:55943 helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43)
	id 1NaLbu-0007vk-8f
	for ged-emacs-devel@m.gmane.org; Wed, 27 Jan 2010 23:04:02 -0500
Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NaLbp-0007uY-Bw
	for emacs-devel@gnu.org; Wed, 27 Jan 2010 23:03:57 -0500
Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1NaLbj-0007qB-OL
	for emacs-devel@gnu.org; Wed, 27 Jan 2010 23:03:56 -0500
Original-Received: from [199.232.76.173] (port=34028 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NaLbj-0007pw-Dw
	for emacs-devel@gnu.org; Wed, 27 Jan 2010 23:03:51 -0500
Original-Received: from mtaout22.012.net.il ([80.179.55.172]:36152)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <eliz@gnu.org>) id 1NaLbi-0006TB-OC
	for emacs-devel@gnu.org; Wed, 27 Jan 2010 23:03:50 -0500
Original-Received: from conversion-daemon.a-mtaout22.012.net.il by
	a-mtaout22.012.net.il (HyperSendmail v2007.08) id
	<0KWX00L00V8WGC00@a-mtaout22.012.net.il> for
	emacs-devel@gnu.org; Thu, 28 Jan 2010 06:03:17 +0200 (IST)
Original-Received: from HOME-C4E4A596F7 ([77.127.180.161]) by a-mtaout22.012.net.il
	(HyperSendmail v2007.08) with ESMTPA id
	<0KWX00I94V9G8ZI0@a-mtaout22.012.net.il>;
	Thu, 28 Jan 2010 06:03:17 +0200 (IST)
In-reply-to: <b4m8wbjasio.fsf@jpl.org>
X-012-Sender: halo1@inter.net.il
X-detected-operating-system: by monty-python.gnu.org: Solaris 10 (beta)
X-BeenThere: emacs-devel@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "Emacs development discussions." <emacs-devel.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/emacs-devel>
List-Post: <mailto:emacs-devel@gnu.org>
List-Help: <mailto:emacs-devel-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=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:120539
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/120539>

> Date: Thu, 28 Jan 2010 11:10:39 +0900
> From: Katsumi Yamaoka <yamaoka@jpl.org>
> 
> BTW, may I fix the last bogus commit in trunk/doc/misc/ChangeLog ?

Fix how?