Branch krita-ui_improvements-silvioheinrich

[Boudewijn Rempt]

On Saturday 04 June 2011 Jun, JL VT wrote:
> 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.
> 

Pentalis,

please make sure to push your branch and push your commit regularly. That makes it a lot easier to coordinate!

-- 
Boudewijn Rempt | http://www.valdyas.org, http://www.krita.org