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		2011-09-13 20:43:59 +02:00
..
gallery	Add gallery example for ProgressBar plasma component	2011-07-25 00:20:16 -03:00