Re: Merging the xwidget branch

[joakim]

Eli Zaretskii <address@hidden> writes:

>> From: address@hidden
>> Cc: address@hidden
>> Date: Fri, 11 Dec 2015 17:33:49 +0100
>> 
>> >> - I would like some hand-holding during commiting of the patch, better
>> >>   yet if some trusted party could do it for me with hand holding from me
>> >>   instead
>> >
>> > What exactly are the problems you envision?
>> 
>> Well, none, except I didn't succeed very well last time.
>
> If you do it on your machine first and have no problems compiling
> after that, both with and without xwidget support, then the result
> cannot be too wrong, I think.
>
>> >> - Some unforseen events have made me have less time than usual at the
>> >>   moment. 
>> >
>> > Will you be able to look into any problems that might come up after
>> > the merge?
>> 
>> Yes, I will have more time after the 17th.
>
> Then lets wait until then, and merge.

Just to make sure:

- xwidget_mvp is the branch we are talking about. I updated it recently
from master

- 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

>
>> Anyway, I'm not envisioning a merge as such, since the history isn't needed.
>
> It's up to you.
>
> Thanks.

-- 
Joakim Verona