nextcloud-desktop/tests/csync_tests
Olivier Goffart b5ed352aa3 Merge remote-tracking branch 'origin/master' into ocsync
Only confluct resolution, do not compile or works

Conflicts:
	CMakeLists.txt
	CPackConfig.cmake
	ConfigureChecks.cmake
	client/csync_client.c
	cmake/Modules/DefineCompilerFlags.cmake
	cmake/Modules/DefineInstallationPaths.cmake
	cmake/Modules/FindIconv.cmake
	cmake/Modules/FindIniparser.cmake
	cmake/Modules/FindNeon.cmake
	config.h.cmake
	config/CMakeLists.txt
	config/ocsync.conf
	doc/CMakeLists.txt
	modules/csync_owncloud.c
	modules/csync_sftp2.c
	src/CMakeLists.txt
	src/csync.c
	src/csync.h
	src/csync_config.c
	src/csync_exclude.c
	src/csync_lock.c
	src/csync_macros.h
	src/csync_misc.c
	src/csync_misc.h
	src/csync_private.h
	src/csync_propagate.c
	src/csync_statedb.c
	src/csync_statedb.h
	src/csync_update.c
	src/csync_util.c
	src/csync_util.h
	src/std/c_dir.c
	src/std/c_file.c
	src/std/c_private.h
	src/std/c_string.c
	src/std/c_string.h
	src/std/c_time.c
	src/vio/csync_vio.c
	src/vio/csync_vio.h
	src/vio/csync_vio_file_stat.h
	src/vio/csync_vio_local.c
	src/vio/csync_vio_method.h
	tests/CMakeLists.txt
	tests/csync_tests/check_csync_statedb_load.c
	tests/csync_tests/check_csync_statedb_query.c
	tests/csync_tests/check_csync_treewalk.c
	tests/csync_tests/check_csync_update.c
	tests/ownCloud/HTTP/DAV.pm
	tests/ownCloud/ownCloud/Test.pm
	tests/std_tests/check_std_c_str.c
	tests/vio_tests/check_vio.c
2013-08-18 16:21:18 +02:00
..
check_csync_commit.c If there is no vio commit function don't fail. 2013-04-24 14:35:19 +02:00
check_csync_config.c Merge remote-tracking branch 'origin/master' into ocsync 2013-08-18 16:21:18 +02:00
check_csync_create.c tests: Migrate check_csync_create to cmocka. 2012-10-17 17:46:45 +02:00
check_csync_exclude.c Add removal of a test dir 2012-11-23 11:43:39 +01:00
check_csync_init.c tests: Migrate check_csync_init to cmocka. 2012-10-19 10:57:40 +02:00
check_csync_lock.c tests: Apply changes to the logging system. 2013-03-01 10:06:06 +01:00
check_csync_log.c tests: Apply changes to the logging system. 2013-03-01 10:06:06 +01:00
check_csync_statedb_load.c Merge remote-tracking branch 'origin/master' into ocsync 2013-08-18 16:21:18 +02:00
check_csync_statedb_query.c Merge remote-tracking branch 'origin/master' into ocsync 2013-08-18 16:21:18 +02:00
check_csync_time.c tests: Migrate check_csync_time to cmocka. 2012-10-19 16:06:47 +02:00
check_csync_treewalk.c Merge remote-tracking branch 'origin/master' into ocsync 2013-08-18 16:21:18 +02:00
check_csync_update.c Merge remote-tracking branch 'origin/master' into ocsync 2013-08-18 16:21:18 +02:00
check_csync_util.c tests: Apply changes to the logging system. 2013-03-01 10:06:06 +01:00