Marco Martin
d72f2d7c3c
Merge branch 'master' into plasma-components-doc
Conflicts: plasma/declarativeimports/plasmacomponents/qml/Button.qml
Description
No description provided
Languages
C++
63.9%
QML
29.4%
CMake
3.3%
Shell
1.3%
Python
1%
Other
1%