<html><body><div style="color:#000; background-color:#fff; font-family:times new roman, new york, times, serif;font-size:12pt"><div>I'm using a separate branch for our own release, so, it will be no problem <br></div><div>to merge it with master, I just want to see it merged :)</div><div><br></div><div>BogDan.<br><blockquote style="border-left: 2px solid rgb(16, 16, 255); margin-left: 5px; padding-left: 5px;"><div style="font-family: times new roman, new york, times, serif; font-size: 12pt;"><div style="font-family: times new roman, new york, times, serif; font-size: 12pt;"><font face="Arial" size="2"><hr size="1"><b><span style="font-weight:bold;">From:</span></b> Daniel Teske <daniel.teske@nokia.com><br><b><span style="font-weight: bold;">To:</span></b> "necessitas-devel@kde.org" <necessitas-devel@kde.org><br><b><span style="font-weight: bold;">Sent:</span></b> Thursday, September 1, 2011 4:43 PM<br><b><span style="font-weight:
bold;">Subject:</span></b> Re: Merging the android plugin to Qt Creator<br></font><br>> I tried to apply your patches 2.3-stagin but it doesn't compile anymore,<br>> should I create another branch and merge master branch of upstream<br>> qt-creator ? This mean to create another merge request !<br>The patches were on top of a master merge into 2.3-staging.<br>So 0002 and 0003 should apply cleanly, whereas you 0001 is only needed if you <br>want to merge master into 2.3-staging. That depends on your plans for the next <br>sdk release. I'd guess you would probably want to use 2.3 for now, which <br>means, you should save 0001 for later.<br><br>daniel<br>_______________________________________________<br>Necessitas-devel mailing list<br><a ymailto="mailto:Necessitas-devel@kde.org" href="mailto:Necessitas-devel@kde.org">Necessitas-devel@kde.org</a><br><a href="https://mail.kde.org/mailman/listinfo/necessitas-devel"
target="_blank">https://mail.kde.org/mailman/listinfo/necessitas-devel</a><br><br><br></div></div></blockquote></div></div></body></html>