-
Dmitry Kazakov authored
# Conflicts: # libs/brush/KisColorfulBrush.cpp # libs/brush/kis_predefined_brush_factory.cpp # libs/global/tests/CMakeLists.txt # plugins/paintops/libpaintop/kis_texture_chooser.cpp # plugins/paintops/libpaintop/kis_texture_option.cpp # plugins/paintops/mypaint/MyPaintSurface.cpp
98c7c5fd