Marco Martin
e5b43a7357
Merge branch 'master' into plasma/declarative
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
Description
No description provided
Languages
C++
63.9%
QML
29.4%
CMake
3.3%
Shell
1.3%
Python
1%
Other
1%