From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Miles Bader Newsgroups: gmane.emacs.devel Subject: unicode branch is merged to trunk Date: Sat, 02 Feb 2008 01:13:36 +0900 Message-ID: <87myqklknj.fsf@catnip.gol.com> Reply-To: Miles Bader NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1201882474 4400 80.91.229.12 (1 Feb 2008 16:14:34 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 1 Feb 2008 16:14:34 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Feb 01 17:14:55 2008 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from mail-forward.uio.no ([129.240.10.42]) by lo.gmane.org with esmtp (Exim 4.50) id 1JKyXM-00021H-Tc for ged-emacs-devel@m.gmane.org; Fri, 01 Feb 2008 17:14:44 +0100 Original-Received: from mail-mx2.uio.no ([129.240.10.30]) by pat.uio.no with esmtp (Exim 4.67) (envelope-from ) id 1JKyWv-0002Xh-Pn for ged-emacs-devel@m.gmane.org; Fri, 01 Feb 2008 17:14:17 +0100 Original-Received: from lists.gnu.org ([199.232.76.165]) by mail-mx2.uio.no with esmtps (TLSv1:AES256-SHA:256) (Exim 4.69) (envelope-from ) id 1JKyWt-0003lZ-5P for ged-emacs-devel@m.gmane.org; Fri, 01 Feb 2008 17:14:17 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JKyWl-0002TY-JW for ged-emacs-devel@m.gmane.org; Fri, 01 Feb 2008 11:14:07 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JKyWh-0002Sz-CV for emacs-devel@gnu.org; Fri, 01 Feb 2008 11:14:03 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JKyWc-0002RR-BU for emacs-devel@gnu.org; Fri, 01 Feb 2008 11:14:02 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JKyWc-0002RJ-4z for emacs-devel@gnu.org; Fri, 01 Feb 2008 11:13:58 -0500 Original-Received: from smtp11.dentaku.gol.com ([203.216.5.73]) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1JKyWV-0003ZA-Jj; Fri, 01 Feb 2008 11:13:52 -0500 Original-Received: from 203-216-97-023.dsl.gol.ne.jp ([203.216.97.23] helo=catnip.gol.com) by smtp11.dentaku.gol.com with esmtpa (Dentaku) id 1JKyWJ-0008KT-Ss; Sat, 02 Feb 2008 01:13:39 +0900 Original-Received: by catnip.gol.com (Postfix, from userid 1000) id D7E962F6A; Sat, 2 Feb 2008 01:13:37 +0900 (JST) System-Type: i686-pc-linux-gnu Original-Lines: 17 X-Virus-Scanned: ClamAV GOL (outbound) X-Abuse-Complaints: abuse@gol.com X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 3) 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 X-UiO-SPF-Received: Received-SPF: pass (mail-mx2.uio.no: domain of gnu.org designates 199.232.76.165 as permitted sender) client-ip=199.232.76.165; envelope-from=emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org; helo=lists.gnu.org; X-UiO-ClamAV-Virus: No X-UiO-Spam-info: not spam, SpamAssassin (score=-1.0, required=5.0, autolearn=disabled, RCVD_IN_DNSWL_LOW=-1) X-UiO-Scanned: FAD2923416489FBC988B83CF94A961F20F0B2700 X-UiO-SPAM-Test: remote_host: 199.232.76.165 spam_score: -9 maxlevel 200 minaction 2 bait 0 mail/h: 30 total 35375 max/h 424 blacklist 0 greylist 0 ratelimit 0 Xref: news.gmane.org gmane.emacs.devel:87939 Archived-At: There are two CVS tags bracketing the merge, "before-merge-unicode-to-trunk", and "merge-unicode-to-trunk". The only processing of ChangeLogs I did was to _prepend_ the ChangeLog.unicode files to the corresponding ChangeLogs, munge the dates in the ChangeLog entries (to be today), and delete ChangeLog.unicode files. I didn't do anything with "etc/NEWS.unicode", as the structure of "etc/NEWS" seems to be complicated enough that some effort will be required to merge them. Thanks, -Miles -- Egotist, n. A person of low taste, more interested in himself than in me.