Christian Kamm 8e055b8a2c PropagateDownload: Create conflict even if local file changed ... Fixes a bug introduced while moving the attribute propagation before the conflict-renaming.		2019-02-11 13:35:14 +01:00
..
3rdparty	Merge remote-tracking branch 'origin/2.5'	2019-01-10 10:08:03 +01:00
cmd	File watcher: Reduce touch ignore duration	2019-02-10 10:41:01 +01:00
common	Vfs: Ensure VfsOff works without start() being called	2019-02-11 13:35:14 +01:00
crashreporter	Do not run macdeployqt.py from CMake.	2019-01-14 12:21:06 +01:00
csync	Discovery: Files can have dehydrate/download actions	2019-02-11 13:35:14 +01:00
gui	Vfs: Add option to hide socketapi pin actions	2019-02-11 13:35:14 +01:00
libsync	PropagateDownload: Create conflict even if local file changed	2019-02-11 13:35:14 +01:00
CMakeLists.txt	Build fix for mingw64 7.3 (Qt 5.12.0)	2019-02-11 13:35:14 +01:00