1. 17 Nov, 2016 2 commits
    • Josef Weidendorfer's avatar
      Bump version number · 238f5b73
      Josef Weidendorfer authored
      Due to the change to KDE5 framework libraries, we
      better increase the version, even though there are
      not really new features.
      238f5b73
    • Josef Weidendorfer's avatar
      Take over the state of frameworks branch into master · bb02689d
      Josef Weidendorfer authored
      We cannot just reset master to point to the frameworks
      branch, as then "git push" is prohibited by the server
      due to the new master not being a descendant of old master.
      To make this work, do a fake merge instead.
      
      Done by:
        git checkout frameworks
        git merge -s ours master
      
      And afterwards make master point to frameworks:
        git checkout master
        git reset --hard frameworks
      bb02689d
  2. 16 Nov, 2016 1 commit
  3. 06 Nov, 2016 2 commits
  4. 29 Oct, 2016 2 commits
  5. 24 Oct, 2016 6 commits
  6. 21 Oct, 2016 4 commits
  7. 29 Sep, 2016 2 commits
  8. 18 Jul, 2016 3 commits
  9. 06 Jul, 2016 7 commits
  10. 28 Jun, 2016 2 commits
  11. 27 Jun, 2016 1 commit
  12. 25 Jun, 2016 1 commit
  13. 30 May, 2016 1 commit
  14. 29 Mar, 2016 3 commits
  15. 21 Mar, 2016 3 commits