<div class="gmail_quote">On Fri, Jun 3, 2011 at 8:26 PM, Silvio Heinrich <span dir="ltr"><<a href="mailto:plassy@web.de">plassy@web.de</a>></span> wrote:<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
if you want it in a separate branch to not mess up your master branch do:<br>
git checkout master<br>
git checkout -b NameOfYourNewBranch<br>
git merge origin/krita-ui_improvements-silvioheinrich<br>
<br>
and then compile :)<br>
<br>
For the developers:<br>
It would be nice if you could stay away from the ui/kis_paintop_box.*<br>
files until I merged the branch<br>
to master because I've rewritten 1/2 - 3/4 of the whole code and<br>
resolving a conflict with code<br>
based on the old kis_paintop_box files wouldn't be this much fun :P<br></blockquote><div><br></div><div>I am currently touching things close to kis_paintop_box.cc but the only change I'm doing is adding 1 connection in the constructor, I hope it doesn't cause merge nightmares.</div>
</div>