← Back to branch summary

~neon/akonadi/master_old

~neon/akonadi/master_old

Viewing all changes in revision 2646.

Committer: Daniel Vrátil
Date: 2016-04-23 16:54:51 UTC
mfrom: (2635.1.21)
Revision ID: git-v1:08186db04f3e4d07d6c2868c5749cd9bc3093399

Merge branch 'Applications/16.04'

files added:
autotests/akonadicontrol/data/akonaditestresource.desktop

files removed:
autotests/akonadicontrol/data/googlecontactsresource.desktop

files modified:
autotests/akonadicontrol/agenttypetest.cpp

src/private/externalpartstorage.cpp

Show diffs side-by-side

added added

removed removed

autotests/akonadicontrol/agenttypetest.cpp

autotests/akonadicontrol/data/akonaditestresource.desktop

autotests/akonadicontrol/data/googlecontactsresource.desktop

src/private/externalpartstorage.cpp

Older »