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
..
core	Merge branch 'master' into plasma/declarative	2011-09-13 20:43:59 +02:00
draganddrop	Fix compile warning	2011-07-08 22:06:29 +02:00
graphicslayouts	use ${IMPORTS_INSTALL_DIR}	2010-10-18 19:20:08 +00:00
graphicswidgets	C++ standard mandates ends of line for includes. Fixes build with Sun Studio.	2010-11-02 23:43:31 +00:00
plasmacomponents	Merge branch 'master' into plasma/declarative	2011-09-13 20:43:59 +02:00
qtextracomponents	paint grey when disabled	2011-08-20 17:43:36 +02:00
test/gallery	Merge branch 'master' into plasma/declarative	2011-09-13 20:43:59 +02:00
CMakeLists.txt	Merge branch 'master' into plasma/declarative	2011-09-13 20:43:59 +02:00