Re: Merging the xwidget branch

[joakim]

Wolfgang Jenkner <address@hidden> writes:

> On Sat, Jan 09 2016, address@hidden 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?

I will have to rework the patch on top of emacs-25 instead. 

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

-- 
Joakim Verona