1. 26 Apr, 2014 2 commits
  2. 20 Apr, 2014 1 commit
  3. 04 Apr, 2014 2 commits
  4. 03 Apr, 2014 2 commits
  5. 01 Apr, 2014 1 commit
  6. 31 Mar, 2014 1 commit
  7. 29 Mar, 2014 1 commit
  8. 26 Mar, 2014 1 commit
  9. 24 Mar, 2014 1 commit
  10. 21 Mar, 2014 2 commits
  11. 20 Mar, 2014 4 commits
  12. 19 Mar, 2014 3 commits
  13. 18 Mar, 2014 1 commit
  14. 10 Mar, 2014 1 commit
    • Martin Flöser's avatar
      Merge branch 'KDE/4.11' · 68fbcded
      Martin Flöser authored
      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
      68fbcded
  15. 07 Feb, 2014 1 commit
  16. 01 Feb, 2014 1 commit
  17. 22 Jan, 2014 1 commit
    • Martin Flöser's avatar
      Merge branch 'KDE/4.11' · b8c6d9fd
      Martin Flöser authored
      Conflicts:
      	kcontrol/randr/krandrtray.desktop
      	kcontrol/randr/module/randrmonitor.desktop
      	kcontrol/randr/randr.desktop
      	kcontrol/screensaver/screensaver.desktop
      	kcontrol/smartcard/smartcard.desktop
      	kcontrol/workspaceoptions/workspaceoptions.desktop
      	kdm/kcm/background/patterns/fish.desktop
      	kdm/kcm/background/patterns/night-rock.desktop
      	kdm/kcm/background/patterns/pavement.desktop
      	kdm/kcm/background/patterns/rattan.desktop
      	kdm/kcm/background/patterns/stonewall2.desktop
      	kdm/kcm/background/programs/xearth.desktop
      	kdm/kcm/background/programs/xglobe.desktop
      	kdm/kcm/background/programs/xplanet.desktop
      	kdm/kcm/kcmkdm_actions.actions
      	kdm/kcm/kdm.desktop
      	kdm/kfrontend/pics/stripes.png.desktop
      	kdm/kfrontend/sessions/9wm.desktop
      	kdm/kfrontend/sessions/aewm++.desktop
      	kdm/kfrontend/sessions/aewm.desktop
      	kdm/kfrontend/sessions/afterstep.desktop
      	kdm/kfrontend/sessions/amaterus.desktop
      	kdm/kfrontend/sessions/amiwm.desktop
      	kdm/kfrontend/sessions/asclassic.desktop
      	kdm/kfrontend/sessions/awesome.desktop
      	kdm/kfrontend/sessions/blackbox.desktop
      	kdm/kfrontend/sessions/cde.desktop
      	kdm/kfrontend/sessions/ctwm.desktop
      	kdm/kfrontend/sessions/cwwm.desktop
      	kdm/kfrontend/sessions/e16.desktop
      	kdm/kfrontend/sessions/enlightenment.desktop
      	kdm/kfrontend/sessions/evilwm.desktop
      	kdm/kfrontend/sessions/fluxbox.desktop
      	kdm/kfrontend/sessions/flwm.desktop
      	kdm/kfrontend/sessions/fvwm.desktop
      	kdm/kfrontend/sessions/fvwm95.desktop
      	kdm/kfrontend/sessions/gnome.desktop
      	kdm/kfrontend/sessions/golem.desktop
      	kdm/kfrontend/sessions/icewm.desktop
      	kdm/kfrontend/sessions/ion.desktop
      	kdm/kfrontend/sessions/kde-plasma-safe.desktop.cmake
      	kdm/kfrontend/sessions/kde-plasma.desktop.cmake
      	kdm/kfrontend/sessions/larswm.desktop
      	kdm/kfrontend/sessions/lwm.desktop
      	kdm/kfrontend/sessions/lxde.desktop
      	kdm/kfrontend/sessions/matchbox.desktop
      	kdm/kfrontend/sessions/metacity.desktop
      	kdm/kfrontend/sessions/mwm.desktop
      	kdm/kfrontend/sessions/olvwm.desktop
      	kdm/kfrontend/sessions/olwm.desktop
      	kdm/kfrontend/sessions/openbox.desktop
      	kdm/kfrontend/sessions/oroborus.desktop
      	kdm/kfrontend/sessions/phluid.desktop
      	kdm/kfrontend/sessions/pwm.desktop
      	kdm/kfrontend/sessions/qvwm.desktop
      	kdm/kfrontend/sessions/ratpoison.desktop
      	kdm/kfrontend/sessions/sapphire.desktop
      	kdm/kfrontend/sessions/sawfish.desktop
      	kdm/kfrontend/sessions/twm.desktop
      	kdm/kfrontend/sessions/ude.desktop
      	kdm/kfrontend/sessions/vtwm.desktop
      	kdm/kfrontend/sessions/w9wm.desktop
      	kdm/kfrontend/sessions/waimea.desktop
      	kdm/kfrontend/sessions/wm2.desktop
      	kdm/kfrontend/sessions/wmaker.desktop
      	kdm/kfrontend/sessions/xfce.desktop
      	kdm/kfrontend/sessions/xfce4.desktop
      	kdm/kfrontend/themes/circles/KdmGreeterTheme.desktop
      	kdm/kfrontend/themes/elarun/KdmGreeterTheme.desktop
      	kscreensaver/kblank_screensaver/kblank.desktop
      	kscreensaver/krandom_screensaver/krandom.desktop
      	kscreensaver/libkscreensaver/screensaver.desktop
      	kwin/kcmkwin/kwincompositing/kwincompositing.desktop
      	kwin/tabbox/qml/clients/text/metadata.desktop
      	kwin/tabbox/qml/clients/window_strip/metadata.desktop
      	libs/kephal/service/kephal.desktop
      	libs/plasmagenericshell/widgetsexplorer/package/metadata.desktop
      	plasma/desktop/applets/kickoff/simpleapplet/plasma-applet-simplelauncher.desktop
      	plasma/desktop/applets/pager/package/metadata.desktop
      	plasma/desktop/applets/pager/plasma-pager-default.desktop
      	plasma/desktop/applets/tasks/plasma-tasks-default.desktop
      	plasma/desktop/applets/trash/plasma-applet-trash.desktop
      	plasma/desktop/applets/window-list/metadata.desktop
      	plasma/desktop/containments/desktop/package/metadata.desktop
      	plasma/desktop/containments/panel/plasma-containment-panel.desktop
      	plasma/desktop/shell/activitymanager/package/metadata.desktop
      	plasma/desktop/shell/data/layouts/org.kde.plasma-desktop.SaL/metadata.desktop
      	plasma/desktop/shell/data/layouts/org.kde.plasma-desktop.findWidgets/metadata.desktop
      	plasma/desktop/shell/data/layouts/org.kde.plasma-desktop.photoActivity/metadata.desktop
      	plasma/desktop/shell/data/plasma-desktop.desktop
      	plasma/desktop/shell/data/plasma-desktop.notifyrc
      	plasma/desktop/toolboxes/plasma-toolbox-desktoptoolbox.desktop
      	plasma/generic/animators/default/plasma-animator-default.desktop
      	plasma/generic/applets/batterymonitor/metadata.desktop
      	plasma/generic/applets/calendar/plasma-applet-calendar.desktop
      	plasma/generic/applets/systemtray/package/contents/ui/IconsList.qml
      	plasma/generic/applets/systemtray/package/contents/ui/StatusNotifierItem.qml
      	plasma/generic/applets/systemtray/package/contents/ui/main.qml
      	plasma/generic/dataengines/metadata/plasma-engine-metadata.desktop
      	plasma/generic/dataengines/nowplaying/plasma-dataengine-nowplaying.desktop
      	plasma/generic/runners/nepomuksearch/plasma-runner-nepomuksearch.desktop
      	plasma/generic/wallpapers/image/plasma-wallpaper-image.desktop
      	plasma/netbook/applets/currentappcontrol/plasma-applet-currentappcontrol.desktop
      	plasma/netbook/applets/searchbox/plasma-applet-searchbox.desktop
      	plasma/netbook/containments/netpanel/plasma-containment-netpanel.desktop
      	plasma/netbook/containments/sal/plasma-containment-sal.desktop
      	plasma/netbook/containments/sal/plasma-sal-menu.desktop
      	plasma/netbook/containments/sal/services/plasma-sal-bookmarks.desktop
      	plasma/netbook/containments/sal/services/plasma-sal-contacts.desktop
      	plasma/netbook/containments/sal/services/plasma-sal-development.desktop
      	plasma/netbook/containments/sal/services/plasma-sal-games.desktop
      	plasma/netbook/containments/sal/services/plasma-sal-graphics.desktop
      	plasma/netbook/containments/sal/services/plasma-sal-internet.desktop
      	plasma/netbook/containments/sal/services/plasma-sal-multimedia.desktop
      	plasma/netbook/containments/sal/services/plasma-sal-office.desktop
      	plasma/netbook/containments/sal/services/plasma-sal-system.desktop
      	plasma/netbook/containments/sal/services/plasma-sal-utility.desktop
      	plasma/netbook/dataengines/searchlaunch/plasma-engine-searchlaunch.desktop
      	plasma/netbook/desktoptheme/air-netbook/metadata.desktop
      	plasma/netbook/shell/data/layouts/org.kde.plasma-netbook.defaultPage/metadata.desktop
      	plasma/netbook/shell/data/layouts/org.kde.plasma-netbook.defaultPanel/metadata.desktop
      	plasma/netbook/shell/data/layouts/org.kde.plasma-netbook.defaultSal/metadata.desktop
      	plasma/netbook/shell/data/layouts/plasma-layout-org.kde.plasma-netbook.defaultPage.desktop
      	plasma/netbook/shell/data/layouts/plasma-layout-org.kde.plasma-netbook.defaultPanel.desktop
      	plasma/netbook/shell/data/layouts/plasma-layout-org.kde.plasma-netbook.defaultSal.desktop
      	plasma/netbook/shell/nettoolbox/plasma-toolbox-nettoolbox.desktop
      b8c6d9fd
  18. 19 Jan, 2014 2 commits
  19. 15 Jan, 2014 3 commits
  20. 07 Jan, 2014 1 commit
    • Martin Flöser's avatar
      Merge branch 'KDE/4.11' into master · 8e050945
      Martin Flöser authored
      Conflicts:
      	CMakeLists.txt
      	doc/kcontrol/screensaver/index.docbook
      	kcontrol/krdb/krdb.cpp
      	kscreensaver/kblank_screensaver/kblank.desktop
      	kscreensaver/krandom_screensaver/krandom.desktop
      	kscreensaver/libkscreensaver/main.cpp
      	ksplash/ksplashqml/SplashApp.cpp
      	kstyles/oxygen/config/main.cpp
      	kstyles/oxygen/demo/main.cpp
      	kstyles/oxygen/oxygenstylehelper.cpp
      	kwin/clients/oxygen/config/oxygenexceptiondialog.cpp
      	kwin/clients/oxygen/config/ui/oxygenconfigurationui.ui
      	kwin/clients/oxygen/config/ui/oxygenexceptiondialog.ui
      	kwin/clients/oxygen/demo/main.cpp
      	kwin/clients/oxygen/oxygenconfigdata.kcfg
      	kwin/egl_wayland_backend.cpp
      	kwin/eglonxbackend.h
      	kwin/glxbackend.cpp
      	kwin/glxbackend.h
      	kwin/kcmkwin/kwinoptions/kwinactions.desktop
      	kwin/scene_opengl.cpp
      	kwin/scene_opengl.h
      	plasma/desktop/applets/pager/pager.cpp
      	plasma/desktop/shell/activitymanager/activitymanager.cpp
      	plasma/desktop/shell/activitymanager/activitymanager.h
      	plasma/desktop/shell/controllerwindow.cpp
      	plasma/desktop/shell/data/plasma-desktop.desktop
      	plasma/generic/dataengines/geolocation/geolocation.cpp
      	plasma/generic/dataengines/nowplaying/plasma-dataengine-nowplaying.desktop
      	plasma/generic/wallpapers/color/plasma-wallpaper-color.desktop
      	plasma/generic/wallpapers/image/image.cpp
      	plasma/generic/wallpapers/image/image.h
      8e050945
  21. 11 Dec, 2013 1 commit
  22. 08 Dec, 2013 1 commit
  23. 07 Dec, 2013 1 commit
  24. 29 Nov, 2013 5 commits