1. 30 Apr, 2014 2 commits
  2. 29 Apr, 2014 3 commits
  3. 28 Apr, 2014 4 commits
  4. 27 Apr, 2014 1 commit
  5. 25 Apr, 2014 2 commits
  6. 24 Apr, 2014 1 commit
  7. 23 Apr, 2014 1 commit
  8. 21 Apr, 2014 1 commit
  9. 20 Apr, 2014 1 commit
  10. 19 Apr, 2014 3 commits
  11. 17 Apr, 2014 2 commits
  12. 16 Apr, 2014 1 commit
    • Laurent Montel's avatar
      Merge remote-tracking branch 'origin/master' into frameworks · ea7e351f
      Laurent Montel authored
      Conflicts:
      	akonadi/collectionrequester.h
      	akonadi/itemsearchjob.cpp
      	akonadi/recentcollectionaction.cpp
      	akonadi/recentcollectionaction_p.h
      	akonadi/standardactionmanager.cpp
      	kabc/plugins/dir/dir.desktop
      	kabc/plugins/file/file.desktop
      	kabc/plugins/ldapkio/ldapkio.desktop
      	kabc/plugins/net/net.desktop
      	kcal/localdir.desktop
      ea7e351f
  13. 15 Apr, 2014 1 commit
  14. 14 Apr, 2014 3 commits
  15. 13 Apr, 2014 7 commits
  16. 12 Apr, 2014 1 commit
  17. 11 Apr, 2014 5 commits
  18. 10 Apr, 2014 1 commit