-
Dmitry Kazakov authored# Conflicts: # plugins/paintops/defaultpaintops/brush/KisBrushOpResources.cpp # plugins/paintops/libpaintop/kis_texture_option.cpp # plugins/paintops/libpaintop/kis_texture_option.h
e303e4dd
# Conflicts: # plugins/paintops/defaultpaintops/brush/KisBrushOpResources.cpp # plugins/paintops/libpaintop/kis_texture_option.cpp # plugins/paintops/libpaintop/kis_texture_option.h