-
Dmitry Kazakov authored
Just merge and resonve the conflicts. It doesn't compile. # Conflicts: # libs/image/brushengine/kis_paintop_settings.cpp # libs/image/brushengine/kis_paintop_settings.h # plugins/paintops/deform/kis_deform_paintop_settings.h # plugins/paintops/deform/kis_deform_paintop_settings_widget.cpp # plugins/paintops/deform/kis_deform_paintop_settings_widget.h # plugins/paintops/gridbrush/kis_grid_paintop.cpp # plugins/paintops/gridbrush/kis_grid_paintop.h # plugins/paintops/gridbrush/kis_grid_paintop_settings.cpp # plugins/paintops/gridbrush/kis_grid_paintop_settings.h # plugins/paintops/gridbrush/kis_gridop_option.h # plugins/paintops/libpaintop/kis_brush_based_paintop_settings.cpp # plugins/paintops/spray/kis_spray_paintop_settings.h # plugins/paintops/spray/kis_spray_paintop_settings_widget.h
77fc4786