On 2/21/13 4:59 PM, "Eskil Abrahamsen Blomfeldt" <eskil.abrahamsen-blomfe...@digia.com> wrote:
>On 02/21/2013 04:54 PM, Oswald Buddenhagen wrote: >> i'll simply block the merge, and i don't even need to resort to my pet >> process reasons for that. > >Ok, we will delay the merge/rebase until Lars is back and can resolve >this conflict. Just FYI: We're working through this now. Basically it'll boil down to upstreaming all changes that can possibly affect other platforms independently, and then have one squashed commit that contains only the Android specific parts. Cheers, Lars _______________________________________________ Development mailing list Development@qt-project.org http://lists.qt-project.org/mailman/listinfo/development
