Conflicts: plasma/declarativeimports/core/CMakeLists.txt plasma/declarativeimports/core/corebindingsplugin.cpp plasma/declarativeimports/plasmacomponents/BusyIndicator.qml plasma/declarativeimports/plasmacomponents/ScrollBar.qml plasma/declarativeimports/plasmacomponents/qmldir |
||
---|---|---|
air | ||
appdashboard | ||
oxygen | ||
CMakeLists.txt |