Merging the android plugin to Qt Creator

[BogDan]

I'm using a separate branch for our own release, so, it will be no problem 

to merge it with master, I just want to see it merged :)

BogDan.


>________________________________
>From: Daniel Teske <daniel.teske at nokia.com>
>To: "necessitas-devel at kde.org" <necessitas-devel at kde.org>
>Sent: Thursday, September 1, 2011 4:43 PM
>Subject: Re: Merging the android plugin to Qt Creator
>
>> I tried to apply your patches 2.3-stagin but it doesn't compile anymore,
>> should I create another branch and merge master branch of upstream
>> qt-creator ? This mean to create another merge request !
>The patches were on top of a master merge into 2.3-staging.
>So 0002 and 0003 should apply cleanly, whereas you 0001 is only needed if you 
>want to merge master into 2.3-staging. That depends on your plans for the next 
>sdk release. I'd guess you would probably want to use 2.3 for now, which 
>means, you should save 0001 for later.
>
>daniel
>_______________________________________________
>Necessitas-devel mailing list
>Necessitas-devel at kde.org
>https://mail.kde.org/mailman/listinfo/necessitas-devel
>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/necessitas-devel/attachments/20110902/8f345111/attachment.html>