-
Dmitry Kazakov authored
Conflicts: krita/image/kis_paint_layer.cc krita/plugins/extensions/dockers/animation/kis_onion_skin_dialog.h
706f382a
Conflicts: krita/image/kis_paint_layer.cc krita/plugins/extensions/dockers/animation/kis_onion_skin_dialog.h