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
28f1c95b96
nextcloud-desktop/src
History
Olivier Goffart 28f1c95b96 Merge remote-tracking branch 'origin/master' into new_discovery_algo 
Conflicts:
	src/csync/csync_reconcile.cpp
	src/csync/csync_update.cpp
	src/libsync/syncengine.cpp
	src/libsync/syncengine.h

Note: csync changes from 5e442f588e
are not included and will be fixed separately
2018-10-04 11:23:19 +02:00
..
3rdparty zsync: Do not create an empty tmp file in the current folder 2018-09-21 17:21:44 +02:00
cmd Merge remote-tracking branch 'origin/master' into new_discovery_algo 2018-10-04 11:23:19 +02:00
common Merge remote-tracking branch 'origin/master' into new_discovery_algo 2018-10-04 11:23:19 +02:00
crashreporter Install libocsync to lib/ without subfolder. 2018-06-20 11:23:16 +02:00
csync Merge remote-tracking branch 'origin/master' into new_discovery_algo 2018-10-04 11:23:19 +02:00
gui Merge remote-tracking branch 'origin/master' into new_discovery_algo 2018-10-04 11:23:19 +02:00
libsync Merge remote-tracking branch 'origin/master' into new_discovery_algo 2018-10-04 11:23:19 +02:00
CMakeLists.txt CMakeLists.txt: Log the Qt version in compile 2018-08-22 16:39:24 +02:00