1. 19 Jan, 2014 1 commit
  2. 05 Jul, 2013 1 commit
  3. 10 Jun, 2013 1 commit
  4. 20 May, 2013 1 commit
    • Oliver Henshaw's avatar
      Merge remote-tracking branch 'origin/KDE/4.10' into master · 6a714a63
      Oliver Henshaw authored
      Conflicts:
      	CMakeLists.txt
      	kcontrol/style/kcmstyle.cpp
      	kwin/effects/boxswitch/boxswitch.desktop
      	kwin/effects/slideback/slideback.desktop
      	kwin/kcmkwin/kwinoptions/kwinactions.desktop
      	kwin/kwin.notifyrc
      	libs/solid/control/backends/fakenet/solid_fakenet.desktop
      	libs/solid/control/solidmodemmanager.desktop
      	libs/solid/control/solidnetworkmanager.desktop
      	libs/solid/control/solidremotecontrolmanager.desktop
      	plasma/generic/applets/batterymonitor/metadata.desktop
      	plasma/generic/applets/lock_logout/metadata.desktop
      	plasma/generic/applets/notifications/contents/ui/LastNotificationPopup.qml
      	plasma/generic/scriptengines/google_gadgets/plasma-packagestructure-googlegadgets.desktop
      	plasma/generic/scriptengines/google_gadgets/plasma-scriptengine-googlegadgets.desktop
      	solid/kcm/kcm_solid.desktop
      	solid/modemmanager-0.4/solid_modemmanager04.desktop
      	solid/networkmanager-0.7/solid_networkmanager07.desktop
      	solid/networkmanager_fake-0.9/solid_networkmanager09_fake.desktop
      	solid/wicd/solid_wicd.desktop
      6a714a63
  5. 02 May, 2013 1 commit
  6. 01 May, 2013 1 commit
  7. 31 Mar, 2013 1 commit
    • David Edmundson's avatar
      Merge branch 'KDE/4.10' · a423b78d
      David Edmundson authored
      Conflicts:
      	CMakeLists.txt
      	plasma/generic/applets/batterymonitor/metadata.desktop
      	plasma/generic/applets/lock_logout/metadata.desktop
      	solid/solid-actions-kcm/device-actions/solid-device-SerialInterface.desktop
      a423b78d
  8. 29 Mar, 2013 1 commit
  9. 28 Mar, 2013 1 commit
  10. 25 Feb, 2013 1 commit
  11. 24 Feb, 2013 2 commits
  12. 06 Feb, 2013 2 commits
  13. 05 Feb, 2013 1 commit
  14. 01 Feb, 2013 3 commits
  15. 29 Jan, 2013 1 commit
  16. 28 Jan, 2013 2 commits
  17. 26 Jan, 2013 3 commits
  18. 22 Jan, 2013 1 commit
  19. 17 Jan, 2013 2 commits
  20. 07 Jan, 2013 1 commit
  21. 24 Dec, 2012 1 commit
  22. 23 Dec, 2012 1 commit
  23. 01 Dec, 2012 1 commit
  24. 12 Jun, 2012 1 commit
  25. 22 Dec, 2011 1 commit
  26. 21 Dec, 2011 1 commit
  27. 20 Dec, 2011 1 commit
  28. 19 Dec, 2011 1 commit
  29. 09 Sep, 2011 1 commit
  30. 08 Sep, 2011 1 commit
  31. 24 Aug, 2011 1 commit
  32. 04 Aug, 2011 1 commit