-
Dmitry Kazakov authored
# Conflicts: # libs/flake/KoShapeGroup.cpp # libs/flake/tests/CMakeLists.txt # libs/global/kis_algebra_2d.h # libs/ui/flake/kis_shape_layer.h # plugins/flake/CMakeLists.txt # plugins/impex/odg/kis_odg_import.cc
f406747e
# Conflicts: # libs/flake/KoShapeGroup.cpp # libs/flake/tests/CMakeLists.txt # libs/global/kis_algebra_2d.h # libs/ui/flake/kis_shape_layer.h # plugins/flake/CMakeLists.txt # plugins/impex/odg/kis_odg_import.cc