1. 03 Jul, 2014 1 commit
  2. 01 Jul, 2014 1 commit
  3. 05 Jun, 2014 1 commit
  4. 20 May, 2014 1 commit
  5. 09 May, 2014 1 commit
  6. 03 May, 2014 1 commit
  7. 02 May, 2014 1 commit
  8. 29 Apr, 2014 3 commits
  9. 28 Apr, 2014 4 commits
  10. 27 Apr, 2014 1 commit
  11. 26 Apr, 2014 2 commits
  12. 20 Apr, 2014 1 commit
  13. 04 Apr, 2014 2 commits
  14. 03 Apr, 2014 2 commits
  15. 01 Apr, 2014 1 commit
  16. 31 Mar, 2014 1 commit
  17. 29 Mar, 2014 1 commit
  18. 26 Mar, 2014 1 commit
  19. 24 Mar, 2014 1 commit
  20. 21 Mar, 2014 2 commits
  21. 20 Mar, 2014 4 commits
  22. 19 Mar, 2014 3 commits
  23. 18 Mar, 2014 1 commit
  24. 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
  25. 07 Feb, 2014 1 commit
  26. 01 Feb, 2014 1 commit