-
José Luis Vergara authored
Conflicts: krita/ui/forms/wdgpaintopsettings.ui krita/ui/kis_paintop_box.cc o kis_paintop_box.cc was merged by rewriting the new signal with the new indenting style. o wdgpaintopsettings.ui was a living nightmare solved by re-creating the .ui file using master as a base and adding the improvements from krita-improvedpresetcreation-pentalis by hand.
30a15c65