kwin/tabbox/qml/clients
Reza Shah 211fdfde4a Merge branch 'KDE/4.9'
Conflicts:
	kcontrol/access/kcmaccess.desktop
	kcontrol/autostart/autostart.desktop
	kcontrol/colors/colors.desktop
	kcontrol/dateandtime/clock.desktop
	kcontrol/desktoppaths/desktoppath.desktop
	kcontrol/fonts/fonts.desktop
	kcontrol/hardware/joystick/joystick.desktop
	kcontrol/keys/keys.desktop
2012-09-23 20:06:44 +09:00
..
big_icons SVN_SILENT made messages (.desktop file) 2012-09-22 17:37:32 +02:00
compact Merge branch 'KDE/4.9' 2012-09-23 20:06:44 +09:00
informative SVN_SILENT made messages (.desktop file) 2012-09-22 17:37:32 +02:00
present_windows SVN_SILENT made messages (.desktop file) 2012-09-22 17:37:32 +02:00
small_icons SVN_SILENT made messages (.desktop file) 2012-09-22 17:37:32 +02:00
text SVN_SILENT made messages (.desktop file) 2012-09-22 17:37:32 +02:00
thumbnails SVN_SILENT made messages (.desktop file) 2012-09-20 10:06:35 +02:00
window_strip SVN_SILENT made messages (.desktop file) 2012-09-20 10:06:35 +02:00