Marco Martin d72f2d7c3c Merge branch 'master' into plasma-components-doc
Conflicts:
	plasma/declarativeimports/plasmacomponents/qml/Button.qml
2011-12-16 18:53:25 +01:00
..
2011-11-28 21:42:27 +01:00
2011-11-21 17:14:44 +01:00
2011-10-27 22:52:16 +02:00
2011-10-27 22:52:16 +02:00
2011-11-08 23:07:42 +01:00
2011-11-08 23:07:42 +01:00
2011-10-27 22:33:51 +02:00
2011-10-27 22:33:51 +02:00