From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: emacs-24 r107805: international/characters.el: Fix sorting. Date: Tue, 10 Apr 2012 19:55:09 +0300 Message-ID: <834nsr7cia.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: dough.gmane.org 1334077037 19754 80.91.229.3 (10 Apr 2012 16:57:17 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 10 Apr 2012 16:57:17 +0000 (UTC) Cc: emacs-devel@gnu.org To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Apr 10 18:57:16 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 1SHeNT-00025Q-CT for ged-emacs-devel@m.gmane.org; Tue, 10 Apr 2012 18:57:11 +0200 Original-Received: from localhost ([::1]:54280 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SHeNS-0003Zt-QS for ged-emacs-devel@m.gmane.org; Tue, 10 Apr 2012 12:57:10 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:35737) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SHeNN-0003Ya-Cy for emacs-devel@gnu.org; Tue, 10 Apr 2012 12:57:09 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SHeNL-0004ZU-Hb for emacs-devel@gnu.org; Tue, 10 Apr 2012 12:57:04 -0400 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:49453) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SHeNL-0004ZA-8e for emacs-devel@gnu.org; Tue, 10 Apr 2012 12:57:03 -0400 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0M2900J00WBHYF00@a-mtaout22.012.net.il> for emacs-devel@gnu.org; Tue, 10 Apr 2012 19:57:01 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([84.229.57.204]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0M2900JXFWF08CN1@a-mtaout22.012.net.il>; Tue, 10 Apr 2012 19:57:01 +0300 (IDT) X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta) X-Received-From: 80.179.55.172 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:149571 Archived-At: Andreas, if you want to change things in this area, please either make the same changes on the trunk, or remove your latest changes from the trunk, and let the next merge add them. The way you do it you make the future merge from the branch harder, because there will be conflicts. TIA