• 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
..
plugins Loading commit data...
qml Loading commit data...
qmlthemes/default Loading commit data...
CMakeLists.txt Loading commit data...
DocumentListModel.cpp Loading commit data...
DocumentListModel.h Loading commit data...
DocumentManager.cpp Loading commit data...
DocumentManager.h Loading commit data...
KisSelectionExtras.cpp Loading commit data...
KisSelectionExtras.h Loading commit data...
KisSketchView.cpp Loading commit data...
KisSketchView.h Loading commit data...
PageThumbnailProvider.cpp Loading commit data...
PageThumbnailProvider.h Loading commit data...
ProgressProxy.cpp Loading commit data...
ProgressProxy.h Loading commit data...
PropertyContainer.cpp Loading commit data...
PropertyContainer.h Loading commit data...
QmlGlobalEngine.cpp Loading commit data...
QmlGlobalEngine.h Loading commit data...
RecentFileManager.cpp Loading commit data...
RecentFileManager.h Loading commit data...
Settings.cpp Loading commit data...
Settings.h Loading commit data...
SketchInputContext.cpp Loading commit data...
SketchInputContext.h Loading commit data...
Theme.cpp Loading commit data...
Theme.h Loading commit data...
VirtualKeyboardController.cpp Loading commit data...
VirtualKeyboardController.h Loading commit data...