Skip to content
Blame History Permalink
  • Dmitry Kazakov's avatar
    Merge remote-tracking branch 'origin/master' into voronwe/colorsmudge-v2-master · d446a74c
    Dmitry Kazakov authored 
    # Conflicts:
#	libs/global/krita_container_utils.h
#	libs/image/kis_transaction.h
#	libs/image/kis_transaction_data.cpp
#	libs/image/kis_transaction_data.h
#	libs/image/tests/kis_algebra_2d_test.cpp
#	libs/image/tests/kis_transaction_test.cpp
#	libs/pigment/tests/KoRgbU8ColorSpaceTester.cpp
#	libs/pigment/tests/KoRgbU8ColorSpaceTester.h
    d446a74c