Marco Martin baf21f6b34 Merge branch 'KDE/4.10' ... Conflicts: plasma/generic/applets/batterymonitor/metadata.desktop plasma/generic/applets/lock_logout/metadata.desktop		2013-01-31 17:00:02 +01:00
..
CMakeLists.txt	Depend directly on kcmutils.	2010-05-12 15:58:45 +00:00
desktop.desktop	SVN_SILENT made messages (.desktop file)	2013-01-31 16:31:28 +01:00
desktopnameswidget.cpp	normalize signal/slots	2011-08-17 23:51:55 +02:00
desktopnameswidget.h	Mark most ctors as explicit as reported by Krazy2 checker	2013-01-02 18:35:46 +01:00
main.cpp	Remove all Q_WS_X11 ifdefs	2013-01-11 08:35:47 +01:00
main.h	Add walk through desktops shortcuts to Virtual Desktops KCM	2013-01-10 08:27:23 +01:00
main.ui	Move control of desktop layout from pager to KWin	2011-07-31 16:47:27 +02:00
Messages.sh	Extract messages from ui files.	2010-04-16 21:43:13 +00:00