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	CMake macros porting	2013-11-27 16:11:14 +01:00
main.qml	Merge branch 'master' into frameworks-scratch	2013-08-07 10:10:06 +02:00
presentwindows.cpp	Merge branch 'KDE/4.11'	2014-03-10 21:21:16 +01:00
presentwindows.desktop	SVN_SILENT made messages (.desktop file)	2014-01-19 06:36:32 +00:00
presentwindows.h	Fix rendering errors of close window button in Present Windows	2013-10-25 12:57:34 +02:00
presentwindows.kcfg	Use KConfigXT in PresentWindows Effect	2012-09-14 10:39:28 +02:00
presentwindows_config.cpp	Port KWin effects away from KAction and KShortcut to Qt5/KF5 classes.	2013-08-15 04:13:12 +09:00
presentwindows_config.desktop	SVN_SILENT made messages (.desktop file)	2013-01-26 13:21:28 +01:00
presentwindows_config.h	Use Q_SLOTS and Q_SIGNALS instead of slots and signals	2013-07-24 09:46:54 +02:00
presentwindows_config.ui	Use KShortcutsEditor directly instead of subclass	2013-09-09 06:57:06 +02:00
presentwindows_proxy.cpp
presentwindows_proxy.h	Mark most ctors as explicit as reported by Krazy2 checker	2013-01-02 18:35:46 +01:00
presentwindowsconfig.kcfgc	Use KConfigXT in PresentWindows Effect	2012-09-14 10:39:28 +02:00