all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: fgallina@gnu.org (Fabián Ezequiel Gallina)
To: emacs-devel <emacs-devel@gnu.org>
Cc: "Glenn Morris" <rgm@gnu.org>, "Eli Zaretskii" <eliz@gnu.org>,
	"Jan Djärv" <jan.h.d@swipnet.se>
Subject: Merge from emacs-24 up to a5f38fa
Date: Sat, 27 Dec 2014 15:52:20 -0300	[thread overview]
Message-ID: <87fvc1ylgb.fsf@gnu.org> (raw)

So this is my first incursion merging the `emacs-24` branch into
`master`.  I have used `gitmerge.el` and everything looks well from
here; this the complete list of conflicts in case you want to take a
look:

    ChangeLog
    doc/emacs/ChangeLog
    doc/lispref/ChangeLog
    doc/lispref/control.texi
    doc/lispref/functions.texi
    etc/ChangeLog
    lisp/ChangeLog
    src/ChangeLog
    src/xterm.c
    test/ChangeLog

I think I managed to do the right thing handling them, but I'd
appreciate if you could take a second look.  Specially to
`doc/lispref/control.texi`, `doc/lispref/functions.texi`, and
`src/xterm.c`.



Thanks,
Fabián



             reply	other threads:[~2014-12-27 18:52 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-12-27 18:52 Fabián Ezequiel Gallina [this message]
2014-12-28 20:44 ` Merge from emacs-24 up to a5f38fa Stefan Monnier

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

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

  git send-email \
    --in-reply-to=87fvc1ylgb.fsf@gnu.org \
    --to=fgallina@gnu.org \
    --cc=eliz@gnu.org \
    --cc=emacs-devel@gnu.org \
    --cc=jan.h.d@swipnet.se \
    --cc=rgm@gnu.org \
    /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 external index

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

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.