Commit Graph

4 Commits

Author SHA1 Message Date
Aaron Seigo
ac344dba18 add missing return statement 2012-01-27 11:08:19 +01:00
Marco Martin
1348d9d2a9 support qicons as icon source 2011-12-28 18:49:55 +01:00
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