plasma-framework/declarativeimports/plasmacomponents/qml/private
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
..
AppManager.js move the private components into a private subdir 2011-12-22 15:16:01 +02:00
ButtonShadow.qml Merge branch 'master' of git://anongit.kde.org/kde-runtime 2011-12-22 18:39:21 +02:00
DualStateButton.qml Merge branch 'master' of git://anongit.kde.org/kde-runtime 2011-12-22 18:39:21 +02:00
IconLoader.qml Merge branch 'master' of git://anongit.kde.org/kde-runtime 2011-12-22 18:39:21 +02:00
PageStack.js move the private components into a private subdir 2011-12-22 15:16:01 +02:00
RoundShadow.qml Merge branch 'master' of git://anongit.kde.org/kde-runtime 2011-12-22 18:39:21 +02:00
ScrollBarDelegate.qml move the private components into a private subdir 2011-12-22 15:16:01 +02:00
ScrollDecoratorDelegate.qml move the private components into a private subdir 2011-12-22 15:16:01 +02:00
SectionScroller.js move the private components into a private subdir 2011-12-22 15:16:01 +02:00
TabBarLayout.qml Merge branch 'master' of git://anongit.kde.org/kde-runtime 2011-12-22 18:39:21 +02:00
TabGroup.js move the private components into a private subdir 2011-12-22 15:16:01 +02:00
TextFieldFocus.qml move the private components into a private subdir 2011-12-22 15:16:01 +02:00