[meego-commits] [meego-dist] Re: 5010: Changes to Trunk/fennec-qt ACCEPTED

[Roger WANG]

Roger WANG <roger.wang at linux.intel.com> writes:

> Roger WANG <roger.wang at linux.intel.com> writes:
>
>> Roger WANG <roger.wang at linux.intel.com> writes:
>>
>>> Chris Ferron <chris.e.ferron at linux.intel.com> writes:
>>>
>>>> Hi Markus Lehtonen,
>>>> The following change has been accepted. See the changelog below.
>>>
>>> Do we accept _direct_ commits into Trunk instead of Trunk:Testing?
>>>
>>> Regarding fennec-qt there is still newer changes pending in
>>> Trunk:Testing than Trunk. So what will happen to Markus's change when
>>> the newer change migrate from Trunk:Testing to Trunk. Will it be lost?
>>
>> Our change pending in Trunk:Testing fixes #3452, which is a day1 release
>> blocker. Will it be left behind?
>
> In order to resolve this conflict, I'm going to merge the two version
> and submit to Trunk directly soon.

I've submitted it with 5028.
-- 
Roger WANG                         Intel Open Source Technology Center