Martin Gräßlin 2675b5d4e7 Merge branch 'KDE/4.11' ... Conflicts: CMakeLists.txt kcontrol/screensaver/screensaver.desktop kdm/kfrontend/themes/elarun/KdmGreeterTheme.desktop khotkeys/kcm_hotkeys/kcm_hotkeys.cpp kinfocenter/main.cpp kscreensaver/kblank_screensaver/blankscrn.cpp kscreensaver/krandom_screensaver/random.cpp kstyles/oxygen/config/main.cpp kstyles/oxygen/demo/main.cpp ksysguard/gui/ksysguard.cpp kwin/clients/oxygen/demo/main.cpp kwin/kcmkwin/kwincompositing/kwincompositing.desktop kwin/tabbox/qml/clients/text/metadata.desktop kwin/tabbox/qml/clients/window_strip/metadata.desktop libs/plasmagenericshell/widgetsexplorer/package/metadata.desktop plasma/desktop/applets/pager/package/metadata.desktop plasma/desktop/shell/activitymanager/package/metadata.desktop plasma/desktop/shell/data/layouts/org.kde.plasma-desktop.defaultPanel/contents/layout.js plasma/desktop/shell/desktopcorona.cpp plasma/desktop/shell/main.cpp plasma/desktop/toolboxes/plasma-toolbox-desktoptoolbox.desktop plasma/desktop/toolboxes/plasma-toolbox-paneltoolbox.desktop plasma/generic/applets/batterymonitor/contents/ui/batterymonitor.qml plasma/generic/applets/systemtray/protocols/fdo/fdographicswidget.cpp plasma/generic/applets/systemtray/protocols/fdo/fdographicswidget.h plasma/generic/applets/systemtray/protocols/fdo/x11embeddelegate.cpp plasma/generic/runners/nepomuksearch/plasma-runner-nepomuksearch.desktop plasma/generic/wallpapers/color/plasma-wallpaper-color.desktop plasma/generic/wallpapers/image/plasma-wallpaper-image.desktop plasma/netbook/shell/nettoolbox/plasma-toolbox-nettoolbox.desktop statusnotifierwatcher/statusnotifierwatcher.cpp systemsettings/app/main.cpp		2014-03-10 21:21:16 +01:00
..
CMakeLists.txt	Port to KF5 renaming changes	2013-12-11 21:41:47 +01:00
Messages.sh	Extract messages from ui files.	2010-04-16 21:43:13 +00:00
desktop.desktop	Merge branch 'KDE/4.11'	2014-03-10 21:21:16 +01:00
desktopnameswidget.cpp	initialize a member and initialize a boolean	2013-04-29 18:14:50 +02:00
desktopnameswidget.h	Port KCMDesktop to Qt 5	2013-09-27 13:43:15 +02:00
main.cpp	[kwin/kcmdesktop] Don't crash if run on platform Wayland	2014-02-11 15:27:28 +01:00
main.h	Port KCMDesktop to Qt 5	2013-09-27 13:43:15 +02:00
main.ui	Drop KDE4Support in kde-workspace/kwin	2013-12-05 20:24:02 +01:00