nextcloud-desktop/modules
Klaas Freitag 2bb52ef6f9 Merge branch 'master' into dav - get cmocka tests and database move.
Conflicts:
	CMakeLists.txt
	cmake/Modules/FindCMocka.cmake
	src/csync.c
	src/csync_exclude.c
	src/csync_reconcile.c
	src/csync_statedb.c
	src/csync_update.c
	src/csync_util.c
	src/vio/csync_vio.c
	tests/CMakeLists.txt
	tests/csync_tests/check_csync_exclude.c
	tests/csync_tests/check_csync_statedb_load.c
	tests/csync_tests/check_csync_statedb_query.c
	tests/csync_tests/check_csync_update.c
	tests/std_tests/check_std_c_path.c
2012-10-27 19:27:14 +02:00
..
CMakeLists.txt Rename csync to ocsync to not collide with upstream csync. 2012-10-01 12:39:05 +02:00
csync_dummy.c modules: Return in dummy_stat() if we have no memory. 2012-10-19 20:37:13 +02:00
csync_owncloud.c Merge branch 'master' into dav - get cmocka tests and database move. 2012-10-27 19:27:14 +02:00
csync_sftp.c mingw: resolve name clashes in sftp module 2012-03-02 17:04:02 +01:00
csync_sftp2.c Fix the vim modlines. 2009-05-13 10:12:07 +02:00
csync_smb.c std: Renamed struct_stat to csync_stat_t and use c_private.h again. 2012-03-21 13:48:41 +01:00