-
Dmitry Kazakov authored
# Conflicts: # libs/brush/CMakeLists.txt # libs/brush/kis_brush.cpp # libs/brush/kis_gbr_brush.cpp # libs/brush/kis_imagepipe_brush.cpp # libs/brush/kis_imagepipe_brush.h # libs/brush/kis_predefined_brush_factory.cpp # plugins/paintops/libpaintop/forms/wdgclipboardbrush.ui # plugins/paintops/libpaintop/kis_brush_chooser.cpp # plugins/paintops/libpaintop/kis_brush_chooser.h # plugins/paintops/libpaintop/kis_custom_brush_widget.cpp
3109e7b8