[calligra] krita: Port Krita fully to the NG iterators.

Cyrille Berger Skott cberger at cberger.net
Mon May 7 14:56:41 BST 2012


Hi,

Because it was more or less decided that we merge branch by squashing the 
commits because it (arguably) makes it easier to "git bisect" (at least, it 
reduce the problem of non-compiling commits in branches).

On Monday 07 May 2012, Lukast dev wrote:
> Hi,
> 
> we decided a long time ago that we will be doing regular merges with
> branches, why you merged the branch by squashing the commits?
> 
> Cheers
> Lukas
> 
> 2012/5/5 Boudewijn Rempt <boud at valdyas.org>:
> > Git commit 5977effb17d6286651f9f9ad8a267cdb5ca7b9be by Boudewijn Rempt.
> > Committed on 05/05/2012 at 16:34.
> > Pushed by rempt into branch 'master'.
> > 
> > Port Krita fully to the NG iterators.
> > 
> > This is a squashed commit of the following:
> > 
> > commit fd43060a9999ffbe12f920137bbb90d0e0effb8a
> > Merge: d52a1c3 b32e3dd
> > Author: Boudewijn Rempt <boud at valdyas.org>
> > Date:   Sat May 5 16:27:36 2012 +0200
> > 
> >    Merge branch 'master' into iterators
> > 
> > commit d52a1c31d8ce83bdd5ff6ce22905794ba82022cc
> > Author: Boudewijn Rempt <boud at valdyas.org>
> > Date:   Sat May 5 16:23:24 2012 +0200
> > 
> >    Fix transform worker
> > 
> >    Transform at 135 degrees works now.
> > 
> >    BUG:298901
> > 
(...)

-- 
Cyrille Berger Skott



More information about the calligra-devel mailing list