Branch krita-ui_improvements-silvioheinrich

JL VT pentalis at gmail.com
Sat Jun 4 05:40:31 CEST 2011


On Fri, Jun 3, 2011 at 8:26 PM, Silvio Heinrich <plassy at web.de> wrote:
>
> if you want it in a separate branch to not mess up your master branch do:
> git checkout master
> git checkout -b NameOfYourNewBranch
> git merge origin/krita-ui_improvements-silvioheinrich
>
> and then compile :)
>
> For the developers:
> It would be nice if you could stay away from the ui/kis_paintop_box.*
> files until I merged the branch
> to master because I've rewritten 1/2 - 3/4 of the whole code and
> resolving a conflict with code
> based on the old kis_paintop_box files wouldn't be this much fun :P
>

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.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.kde.org/pipermail/kimageshop/attachments/20110603/dacf6dd6/attachment.htm 


More information about the kimageshop mailing list