[calligra] /: Merge remote branch 'origin/krita-colorsmudge-silvioheinrich'

[Cyrille Berger Skott]

Hi,

This commit is breaking the following unit test:

http://my.cdash.org/testSummary.php?project=344&name=libs-pigment-
TestKoRgbU8ColorSpaceTester&date=2011-03-17

Can you have a look ?

On Thursday 17 March 2011, Silvio Heinrich wrote:
> Git commit 2bf799a206d7f54a158afb86a3c31f35eccbb811 by Silvio Heinrich.
> Committed on 17/03/2011 at 17:01.
> Pushed by heinrich into branch 'master'.
> 
> Merge remote branch 'origin/krita-colorsmudge-silvioheinrich'
> 
> I  +6    -1    krita/data/paintoppresets/CMakeLists.txt
> I  +-    --    krita/data/paintoppresets/ColorSmudge - Brush.kpp
> I  +-    --    krita/data/paintoppresets/ColorSmudge - Oil Paint.kpp
> I  +-    --    krita/data/paintoppresets/ColorSmudge - Smudge Only.kpp
> I  +-    --    krita/data/paintoppresets/ColorSmudge - Structure Brush.kpp
> I  +-    --    krita/data/paintoppresets/ColorSmudge - Wet Paint.kpp
> I  +1    -0    krita/image/kis_painter.cc
> I  +1    -0    krita/plugins/paintops/CMakeLists.txt
> I  +20   -0    krita/plugins/paintops/colorsmudge/CMakeLists.txt
> I  +51   -0   
> krita/plugins/paintops/colorsmudge/colorsmudge_paintop_plugin.cpp I  +36  
> -0    krita/plugins/paintops/colorsmudge/colorsmudge_paintop_plugin.h I 
> +181  -0    krita/plugins/paintops/colorsmudge/kis_colorsmudgeop.cpp I 
> +61   -0    krita/plugins/paintops/colorsmudge/kis_colorsmudgeop.h I  +59 
>  -0   
> krita/plugins/paintops/colorsmudge/kis_colorsmudgeop_settings_widget.cpp I
>  +39   -0   
> krita/plugins/paintops/colorsmudge/kis_colorsmudgeop_settings_widget.h I 
> +56   -0    krita/plugins/paintops/colorsmudge/kis_overlay_mode_option.h I
>  +58   -0    krita/plugins/paintops/colorsmudge/kis_rate_option.cpp I  +53
>   -0    krita/plugins/paintops/colorsmudge/kis_rate_option.h I  +71   -0  
>  krita/plugins/paintops/colorsmudge/kis_rate_option_widget.cpp I  +44   -0
>    krita/plugins/paintops/colorsmudge/kis_rate_option_widget.h I  +-    --
>    krita/plugins/paintops/colorsmudge/krita-colorsmudge.png I  +6    -0   
> krita/plugins/paintops/colorsmudge/kritacolorsmudgepaintop.desktop I  +60 
>  -80   libs/pigment/compositeops/KoCompositeOpCopy2.h
> I  +93   -0    libs/pigment/compositeops/KoCompositeOpCopyOpacy.h
> I  +4    -1    libs/pigment/compositeops/KoCompositeOps.h
> 
> http://commits.kde.org/calligra/2bf799a206d7f54a158afb86a3c31f35eccbb811


-- 
Cyrille Berger Skott