2675b5d4e7
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 |
||
|---|---|---|
| .. | ||
| CMakeLists.txt | ||
| showfps.cpp | ||
| showfps.desktop | ||
| showfps.h | ||
| showfps.kcfg | ||
| showfps_config.cpp | ||
| showfps_config.desktop | ||
| showfps_config.h | ||
| showfps_config.ui | ||
| showfpsconfig.kcfgc | ||