Commit Graph

2 Commits

Author SHA1 Message Date
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
Giorgos Tsiapaliwkas
9a1e332b9b move the private components into a private subdir 2011-12-22 15:16:01 +02:00