kwin/tabbox/qml/clients
Martin Gräßlin 90365e27d0 Merge branch 'KDE/4.9'
Conflicts:
	khotkeys/data/kde32b1.khotkeys
	kinfocenter/Modules/opengl/opengl.desktop
	kwin/tabbox/tests/CMakeLists.txt
	plasma/generic/applets/system-monitor/plasma-applet-sm_hdd_activity.desktop
2012-08-17 17:59:49 +02:00
..
big_icons Merge branch 'KDE/4.9' 2012-08-17 17:59:49 +02:00
compact SVN_SILENT made messages (.desktop file) 2012-08-12 10:22:00 +02:00
informative SVN_SILENT made messages (.desktop file) 2012-08-12 10:22:00 +02:00
present_windows SVN_SILENT made messages (.desktop file) 2012-08-12 10:22:00 +02:00
small_icons SVN_SILENT made messages (.desktop file) 2012-08-12 10:22:00 +02:00
text SVN_SILENT made messages (.desktop file) 2012-08-12 10:22:00 +02:00
thumbnails SVN_SILENT made messages (.desktop file) 2012-08-12 10:22:00 +02:00
window_strip SVN_SILENT made messages (.desktop file) 2012-08-12 10:22:00 +02:00