• 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
..
backport-utils Loading commit data...
tests Loading commit data...
plot_strokes_statistics Loading commit data...