nextcloud-desktop/client
Olivier Goffart 95edd6a9de Merge remote-tracking branch 'origin/master' into dav
Conflicts:
	config/ocsync_log.conf
	src/csync.c
	src/csync.h
	src/csync_config.c
	src/csync_log.h
	src/csync_private.h
	src/csync_statedb.c
	tests/csync_tests/check_csync_config.c
2012-12-03 17:32:08 +01: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 remote-tracking branch 'origin/master' into dav 2012-12-03 17:32:08 +01:00