Merge remote-tracking branch '2.1' into 2.2
authorOlivier Goffart <ogoffart@woboq.com>
Wed, 25 May 2016 14:23:58 +0000 (16:23 +0200)
committerOlivier Goffart <ogoffart@woboq.com>
Wed, 25 May 2016 14:23:58 +0000 (16:23 +0200)
commite960b265a8adb3e78037ca29033860a5d7de870a
tree2f58ec1121aff9eebd0bad30a9696dc01ed17e28
parent1d93af5f647690ad4fe483442d0a6b97f26633a5
parentf6b35e5d58b59ed02ba76f4d7df262b7952567d8
Merge remote-tracking branch '2.1' into 2.2
CMakeLists.txt
src/libsync/propagatedownload.cpp
src/libsync/syncengine.cpp
src/libsync/syncjournaldb.cpp