]> dgit.raspbian.org Git - nextcloud-desktop.git/commit
Merge branch 'master' into dbjournal_per_account
authorChristian Kamm <mail@ckamm.de>
Tue, 22 Nov 2016 12:09:56 +0000 (13:09 +0100)
committerChristian Kamm <mail@ckamm.de>
Wed, 23 Nov 2016 15:47:56 +0000 (16:47 +0100)
commit3e59a9b31600270b7c037c3b6149a51292626b3b
tree27c9e56492757576f43b584dca1790b435dbcb99
parent16e28567a63bf3ca9ac44de0e35833bb0db5c93e
parent4998303c424d8ea050da30d2dd426a2472c8301b
Merge branch 'master' into dbjournal_per_account
28 files changed:
csync/src/csync.c
csync/src/csync.h
csync/src/csync_exclude.c
csync/src/csync_update.c
csync/tests/csync_tests/check_csync_commit.c
csync/tests/csync_tests/check_csync_create.c
csync/tests/csync_tests/check_csync_exclude.c
csync/tests/csync_tests/check_csync_init.c
csync/tests/csync_tests/check_csync_log.c
csync/tests/csync_tests/check_csync_statedb_load.c
csync/tests/csync_tests/check_csync_statedb_query.c
csync/tests/csync_tests/check_csync_update.c
doc/architecture.rst
src/cmd/cmd.cpp
src/gui/folder.cpp
src/gui/folderman.cpp
src/gui/folderman.h
src/gui/folderwatcher_linux.cpp
src/libsync/propagateremotemove.cpp
src/libsync/syncengine.cpp
src/libsync/syncengine.h
src/libsync/syncjournaldb.cpp
src/libsync/syncjournaldb.h
src/libsync/utility.cpp
src/libsync/utility.h
test/syncenginetestutils.h
test/testfolderman.cpp
test/testutility.cpp