• 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
..
CMakeLists.txt Loading commit data...
KoAnchorSelectionWidgetTest.cpp Loading commit data...
KoAnchorSelectionWidgetTest.h Loading commit data...
KoResourceTaggingTest.cpp Loading commit data...
KoResourceTaggingTest.h Loading commit data...
zoomcontroller_test.cpp Loading commit data...
zoomcontroller_test.h Loading commit data...
zoomhandler_test.cpp Loading commit data...
zoomhandler_test.h Loading commit data...