From: Wolfgang Jenkner <wjenkner@inode.at>
To: joakim@verona.se
Cc: Eli Zaretskii <eliz@gnu.org>, emacs-devel@gnu.org
Subject: Re: Merging the xwidget branch
Date: Mon, 11 Jan 2016 20:34:04 +0100 [thread overview]
Message-ID: <8560yzewpg.fsf@iznogoud.viz> (raw)
In-Reply-To: m3poxbuleb.fsf@exodia.verona.se
On Sat, Jan 09 2016, joakim@verona.se wrote:
> - xwidget_mvp is the branch we are talking about. I updated it recently
> from master
And there were merges from master before that. Perhaps I'm missing
something but doesn't that pretty much preclude merging xwidget_mpv into
emacs-25?
> - There are maybe some spurious diffs in there somewhere. I can have a
> look.
>
> - I'm not sure which branch we are going to merge this to, I'll leave
> that to Eli
next prev parent reply other threads:[~2016-01-11 19:34 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-11 9:44 Merging the xwidget branch Eli Zaretskii
2015-12-11 15:33 ` joakim
2015-12-11 16:17 ` Eli Zaretskii
2015-12-11 16:33 ` joakim
2015-12-11 18:32 ` Eli Zaretskii
2016-01-09 9:52 ` joakim
2016-01-09 11:23 ` Eli Zaretskii
2016-01-11 17:55 ` John Wiegley
2016-01-11 19:00 ` Eli Zaretskii
2016-01-09 9:55 ` joakim
2016-01-11 19:34 ` Wolfgang Jenkner [this message]
2016-01-11 19:43 ` joakim
2016-01-16 8:27 ` Eli Zaretskii
2016-01-17 20:03 ` joakim
2016-01-17 20:49 ` Eli Zaretskii
2016-01-18 7:28 ` joakim
2016-01-18 15:39 ` Eli Zaretskii
2016-01-18 21:52 ` joakim
2016-01-19 15:53 ` Eli Zaretskii
2016-01-19 20:08 ` joakim
2016-01-19 20:22 ` Eli Zaretskii
2016-01-20 7:28 ` John Wiegley
2016-01-20 7:56 ` Nicolas Petton
2016-01-18 12:11 ` joakim
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=8560yzewpg.fsf@iznogoud.viz \
--to=wjenkner@inode.at \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=joakim@verona.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 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.