• Jouni Pentikäinen's avatar
    Merge branch 'master' into rempt/intel-3 · 71ff0dcd
    Jouni Pentikäinen authored
    # Conflicts:
    # libs/libqml/KisSketchView.cpp
    # libs/ui/CMakeLists.txt
    # libs/ui/KisMainWindow.cpp
    # libs/ui/KisMainWindow.h
    # libs/ui/KisPart.cpp
    # libs/ui/KisPart.h
    # libs/ui/KisView.cpp
    # libs/ui/KisView.h
    # libs/ui/canvas/kis_canvas2.cpp
    # libs/ui/canvas/kis_canvas2.h
    # libs/widgets/tests/zoomcontroller_test.cpp
    71ff0dcd
Name
Last commit
Last update
..
data Loading commit data...
doc Loading commit data...
dtd Loading commit data...
integration Loading commit data...
pics Loading commit data...
.krazy Loading commit data...
CMakeLists.txt Loading commit data...
ChangeLog Loading commit data...
Info.plist.template Loading commit data...
krita.action Loading commit data...
krita.qrc Loading commit data...
krita4.xmlgui Loading commit data...
kritamenu.action Loading commit data...
main.cc Loading commit data...
org.kde.krita.appdata.xml Loading commit data...
org.kde.krita.desktop Loading commit data...