-
Dmitry Kazakov authored
# Conflicts: # krita/data/CMakeLists.txt # libs/ui/KisApplication.cpp # plugins/dockers/artisticcolorselector/kis_color_selector.cpp
7f4580ef
# Conflicts: # krita/data/CMakeLists.txt # libs/ui/KisApplication.cpp # plugins/dockers/artisticcolorselector/kis_color_selector.cpp