• 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...
KisRectsCollisionsTracker.h Loading commit data...
empty_nodes_test.h Loading commit data...
filestest.h Loading commit data...
kistest.h Loading commit data...
lod_override.h Loading commit data...
qimage_based_test.h Loading commit data...
qimage_test_util.h Loading commit data...
stroke_testing_utils.cpp Loading commit data...
stroke_testing_utils.h Loading commit data...
testing_nodes.h Loading commit data...
testing_timed_default_bounds.h Loading commit data...
testutil.cpp Loading commit data...
testutil.h Loading commit data...
ui_manager_test.h Loading commit data...