Skip to content
  • Friedrich W. H. Kossebau's avatar
    Merge remote-tracking branch 'origin/master' into frameworks · 02448db9
    Friedrich W. H. Kossebau authored
    # Conflicts:
    #	.gitignore
    #	CMakeLists.txt
    #	braindump/src/CMakeLists.txt
    #	extras/thumbnail/CMakeLists.txt
    #	filters/sheets/html/CMakeLists.txt
    #	filters/stage/powerpoint/CMakeLists.txt
    #	kexi/plugins/shapes/relationdesign/CMakeLists.txt
    #	krita/benchmarks/CMakeLists.txt
    #	krita/crashreporter/CMakeLists.txt
    #	krita/image/kis_group_layer.cc
    #	krita/plugins/extensions/gmic/CMakeLists.txt
    #	krita/ui/CMakeLists.txt
    #	libs/flake/CMakeLists.txt
    #	libs/flake/KoToolManager_p.cpp
    #	libs/koplugin/CMakeLists.txt
    #	libs/main/CMakeLists.txt
    #	libs/odf/CMakeLists.txt
    #	libs/odf/tests/CMakeLists.txt
    #	libs/version/CMakeLists.txt
    #	libs/version/calligraversion.h.cmake
    #	libs/widgets/CMakeLists.txt
    #	libs/widgetutils/CMakeLists.txt
    #	plan/libs/kernel/CMakeLists.txt
    #	plan/libs/ui/CMakeLists.txt
    #	plugins/formulashape/tests/CMakeLists.txt
    #	plugins/musicshape/CMakeLists.txt
    #	plugins/musicshape/core/tests/CMakeLists.txt
    #	plugins/pictureshape/CMakeLists.txt
    #	plugins/semanticitems/contact/CMakeLists.txt
    #	plugins/semanticitems/event/CMakeLists.txt
    #	plugins/semanticitems/location/CMakeLists.txt
    #	plugins/vectorshape/CMakeLists.txt
    #	sheets/CMakeLists.txt
    #	stage/part/CMakeLists.txt
    02448db9