plasma-framework/declarativeimports
Giorgos Tsiapaliwkas 4c627ff830 Merge branch 'master' of git://anongit.kde.org/kde-runtime
Conflicts:
	plasma/declarativeimports/plasmacomponents/qml/ScrollBar.qml
2011-12-22 18:39:21 +02:00
..
2011-12-16 11:53:07 +01:00
2011-12-15 19:51:38 +01:00