mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-23 13:35:58 +03:00
Code Issues Projects Releases Packages Wiki Activity
nextcloud-desktop/client
History
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_auth.c Replace csync_auth with ssh_gets implementation from libssh 2012-03-02 17:04:02 +01:00
csync_auth.h Replace csync_auth with ssh_gets implementation from libssh 2012-03-02 17:04:02 +01:00
csync_client.c Merge branch 'master' into dav - get cmocka tests and database move. 2012-10-27 19:27:14 +02:00