-
Christophe Giboudeaux authored
Conflicts: CMakeLists.txt akonadi/src/core/collectionsync.cpp akonadi/src/core/itemsync.cpp akonadi/src/core/jobs/collectionselectjob_p.h akonadi/src/core/jobs/itemfetchjob.cpp akonadi/src/core/models/entitytreemodel_p.cpp
553c3461