unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Glenn Morris <rgm@gnu.org>
To: "Jan D." <jan.h.d@swipnet.se>
Cc: Adrian Robert <adrian.b.robert@gmail.com>,
	"emacs-devel@gnu.org Development" <emacs-devel@gnu.org>
Subject: Re: NS compile error after trunk merge r118324
Date: Sun, 09 Nov 2014 14:40:03 -0500	[thread overview]
Message-ID: <5h61eo6u3w.fsf@fencepost.gnu.org> (raw)
In-Reply-To: <E3BCA9F8-C9B6-44D2-906E-84CB7890DA77@swipnet.se> (Jan D.'s message of "Sun, 9 Nov 2014 11:36:14 +0100")


Sorry if I messed that up. There are a lot of merge conflicts these days,
though I don't remember getting one with that change.



  reply	other threads:[~2014-11-09 19:40 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-09  6:12 NS compile error after trunk merge r118324 Adrian Robert
2014-11-09 10:36 ` Jan D.
2014-11-09 19:40   ` Glenn Morris [this message]
2014-11-09 21:25     ` Jan D.
2014-11-09 22:57       ` Glenn Morris
2014-11-10  6:17         ` Jan Djärv
2014-11-10  7:40           ` Glenn Morris

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=5h61eo6u3w.fsf@fencepost.gnu.org \
    --to=rgm@gnu.org \
    --cc=adrian.b.robert@gmail.com \
    --cc=emacs-devel@gnu.org \
    --cc=jan.h.d@swipnet.se \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).