From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!not-for-mail
From: Glenn Morris <rgm@gnu.org>
Newsgroups: gmane.emacs.devel
Subject: Re: merging emacs-24
Date: Sat, 29 Nov 2014 16:27:21 -0500
Message-ID: <msvblxzohy.fsf@fencepost.gnu.org>
References: <m2h9xyzd45.fsf@jbm.io> <m2lhnamlnr.fsf@jbm.io>
	<87a93eavwt.fsf@lifelogs.com>
	<jwvd28ahs60.fsf-monnier+emacsbugs@gnu.org>
	<87wq6hap7v.fsf@lifelogs.com>
	<jwvr3wphjsy.fsf-monnier+emacsbugs@gnu.org>
	<87y4qx76hh.fsf@lifelogs.com> <87r3wpmmf6.fsf@wanadoo.es>
	<87oart74q5.fsf@lifelogs.com> <61sih5uww3.fsf@fencepost.gnu.org>
	<878uiw7q5n.fsf@lifelogs.com> <87ioi05fom.fsf@lifelogs.com>
	<547973D6.9040806@cs.ucla.edu>
NNTP-Posting-Host: plane.gmane.org
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-Trace: ger.gmane.org 1417296455 16023 80.91.229.3 (29 Nov 2014 21:27:35 GMT)
X-Complaints-To: usenet@ger.gmane.org
NNTP-Posting-Date: Sat, 29 Nov 2014 21:27:35 +0000 (UTC)
Cc: emacs-devel@gnu.org
To: Paul Eggert <eggert@cs.ucla.edu>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 29 22:27:28 2014
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 ([208.118.235.17])
	by plane.gmane.org with esmtp (Exim 4.69)
	(envelope-from <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1XupY6-00019b-FQ
	for ged-emacs-devel@m.gmane.org; Sat, 29 Nov 2014 22:27:26 +0100
Original-Received: from localhost ([::1]:48919 helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1XupY6-00077m-2L
	for ged-emacs-devel@m.gmane.org; Sat, 29 Nov 2014 16:27:26 -0500
Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60395)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <rgm@gnu.org>)
	id 1XupY2-00077g-Ln
	for emacs-devel@gnu.org; Sat, 29 Nov 2014 16:27:23 -0500
Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <rgm@gnu.org>) id 1XupY2-0006un-0i
	for emacs-devel@gnu.org; Sat, 29 Nov 2014 16:27:22 -0500
Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:47642)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <rgm@gnu.org>)
	id 1XupY1-0006uj-TN
	for emacs-devel@gnu.org; Sat, 29 Nov 2014 16:27:21 -0500
Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.71)
	(envelope-from <rgm@gnu.org>)
	id 1XupY1-0002aA-DV; Sat, 29 Nov 2014 16:27:21 -0500
X-Spook: AFSPC condor BLU-97 A/B rs9512c covert video Audiotel
X-Ran: /#:R&&Wm2S*&Jv_eII1T'}(B(@S@':rTh}y0._yNv35Ii"cxTGKOem1`,SF[`l4q^8pbu6
X-Hue: magenta
X-Attribution: GM
User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/)
X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address
	(bad octet value).
X-Received-From: 2001:4830:134:3::e
X-BeenThere: emacs-devel@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "Emacs development discussions." <emacs-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-devel>
List-Post: <mailto:emacs-devel@gnu.org>
List-Help: <mailto:emacs-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=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:178488
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/178488>


Backported changes were again duplicated in the ChangeLog.
(Please could whoever does this next keep this in mind.)
Jan's 2014-11-15 emacs-24 change to nsterm.m was duplicated and
somehow attributed to Ulf Jasper.