unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
* Merge from emacs-24 up to a5f38fa
@ 2014-12-27 18:52 Fabián Ezequiel Gallina
  2014-12-28 20:44 ` Stefan Monnier
  0 siblings, 1 reply; 2+ messages in thread
From: Fabián Ezequiel Gallina @ 2014-12-27 18:52 UTC (permalink / raw)
  To: emacs-devel; +Cc: Glenn Morris, Eli Zaretskii, Jan Djärv

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



^ permalink raw reply	[flat|nested] 2+ messages in thread
* Re: Merge from emacs-24 up to a5f38fa
  2014-12-27 18:52 Merge from emacs-24 up to a5f38fa Fabián Ezequiel Gallina
@ 2014-12-28 20:44 ` Stefan Monnier
  0 siblings, 0 replies; 2+ messages in thread
From: Stefan Monnier @ 2014-12-28 20:44 UTC (permalink / raw)
  To: Fabián Ezequiel Gallina
  Cc: Glenn Morris, Eli Zaretskii, Jan Djärv, emacs-devel

> So this is my first incursion merging the `emacs-24` branch into
> `master`.

Thanks for taking on this merge, it's very appreciated.

> 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:

I haven't looked in detail, but what I saw looked fine,


        Stefan



^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-12-28 20:44 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-12-27 18:52 Merge from emacs-24 up to a5f38fa Fabián Ezequiel Gallina
2014-12-28 20:44 ` Stefan Monnier

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).