8dfd8650ff
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 |
||
---|---|---|
.. | ||
dialogs | ||
icons | ||
opaque | ||
translucent | ||
widgets | ||
CMakeLists.txt | ||
colors | ||
metadata.desktop |