1. 03 May, 2015 2 commits
  2. 02 May, 2015 1 commit
  3. 01 May, 2015 4 commits
    • Laurent Montel's avatar
      Use new kde macro · f1fe00c2
      Laurent Montel authored
      f1fe00c2
    • Laurent Montel's avatar
      Merge remote-tracking branch 'origin/KDE/4.14' · a0a5a0a0
      Laurent Montel authored
      Conflicts:
      	agents/CMakeLists.txt
      	agents/invitations/CMakeLists.txt
      	agents/maildispatcher/CMakeLists.txt
      	agents/migration/CMakeLists.txt
      	agents/newmailnotifier/CMakeLists.txt
      	resources/birthdays/CMakeLists.txt
      	resources/dav/resource/CMakeLists.txt
      	resources/facebook/CMakeLists.txt
      	resources/gmail/CMakeLists.txt
      	resources/kabc/CMakeLists.txt
      	resources/kcal/CMakeLists.txt
      	resources/kdeaccounts/CMakeLists.txt
      	resources/kolab/CMakeLists.txt
      	resources/kolabproxy/CMakeLists.txt
      	resources/localbookmarks/CMakeLists.txt
      	resources/maildir/CMakeLists.txt
      	resources/mailtransport_dummy/CMakeLists.txt
      	resources/nntp/CMakeLists.txt
      a0a5a0a0
    • Heiko Becker's avatar
      Use SHARE_INSTALL_PREFIX to install akonadi's desktop files · 7ea6ac1f
      Heiko Becker authored
      This is helpful on a multiarch layout where the prefix is /usr/${host}
      but arch-independent files should still be installed to /usr/share.
      
      REVIEW: 123581
      7ea6ac1f
    • Script Kiddy's avatar
      SVN_SILENT made messages (.desktop file) - always resolve ours · 1d70843b
      Script Kiddy authored
      In case of conflict in i18n, keep the version of the branch "ours"
      To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
      1d70843b
  4. 30 Apr, 2015 10 commits
  5. 29 Apr, 2015 6 commits
  6. 28 Apr, 2015 6 commits
  7. 27 Apr, 2015 2 commits
  8. 26 Apr, 2015 1 commit
  9. 24 Apr, 2015 1 commit
  10. 23 Apr, 2015 2 commits
  11. 22 Apr, 2015 5 commits