Martin Gräßlin 5a33974bca Merge branch 'KDE/4.9' ... Conflicts: plasma/desktop/shell/activitymanager/package/contents/ui/ActivityDelegate.qml		2012-10-24 20:40:07 +02:00
..
qml
thumbnails
CMakeLists.txt
kwinswitcher.knsrc
kwintabbox.desktop
layoutpreview.cpp
layoutpreview.h
main.cpp	Merge branch 'KDE/4.9'	2012-10-24 20:40:07 +02:00
main.h
main.ui
Messages.sh
thumbnailitem.cpp
thumbnailitem.h