Merge branch 'kill_legacy_propagator'
authorMarkus Goetz <markus@woboq.com>
Wed, 28 Oct 2015 10:06:50 +0000 (11:06 +0100)
committerMarkus Goetz <markus@woboq.com>
Wed, 28 Oct 2015 10:06:50 +0000 (11:06 +0100)
commita6c9e8c5b4b576826e51ef22afe4e64319e1885c
tree9e432d312a1947efaecce535902b4d14a3020808
parentc81b02c7d95944ed41beed2b558c4bd9b69333a1
parent9337927722425b863022776ccc324a4c7e838a3b
Merge branch 'kill_legacy_propagator'
csync/src/csync.h
src/gui/folder.cpp
src/libsync/propagateupload.cpp
src/libsync/syncengine.cpp
src/libsync/syncengine.h
test/CMakeLists.txt