mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
09deeaf8a8
nextcloud-desktop/src
History
Olivier Goffart 09deeaf8a8 Merge remote-tracking branch 'owncloud/master' into new_discovery_algo 
Conflicts:
	src/csync/csync_reconcile.cpp
	src/csync/csync_update.cpp
2018-07-25 14:06:14 +02:00
..
3rdparty sqlite: Update bundled version to 3.24.0 2018-07-19 17:11:47 +02:00
cmd Rename ocsync library to ${APPLICATION_EXECUTABLE}_csync 2018-06-20 11:23:16 +02:00
common Merge remote-tracking branch 'owncloud/master' into new_discovery_algo 2018-07-25 14:06:14 +02:00
crashreporter Install libocsync to lib/ without subfolder. 2018-06-20 11:23:16 +02:00
csync Merge remote-tracking branch 'owncloud/master' into new_discovery_algo 2018-07-25 14:06:14 +02:00
gui Merge remote-tracking branch 'owncloud/master' into new_discovery_algo 2018-07-25 14:06:14 +02:00
libsync Merge remote-tracking branch 'owncloud/master' into new_discovery_algo 2018-07-25 14:06:14 +02:00
CMakeLists.txt Rename ocsync library to ${APPLICATION_EXECUTABLE}_csync 2018-06-20 11:23:16 +02:00