nextcloud-desktop/csync/src
Olivier Goffart de11f602d5 Merge remote-tracking branch 'origin/il'
Conflicts:
	csync/src/csync_private.h
	src/CMakeLists.txt
	src/gui/folder.cpp
	src/libsync/owncloudpropagator.cpp
	src/libsync/owncloudpropagator.h
	src/libsync/propagator_qnam.cpp
	src/libsync/propagator_qnam.h
	src/libsync/syncengine.cpp
	src/libsync/syncengine.h
	src/mirall/syncjournaldb.cpp
2014-11-08 10:48:36 +01:00
..
httpbf Legacy propagator: Don't use mtime retrieved via _fstat64. 2014-11-06 12:16:55 +01:00
std Ignore reserved words on Windows 2014-10-24 13:18:57 -04:00
vio Merge remote-tracking branch 'origin/il' 2014-11-08 10:48:36 +01:00
CMakeLists.txt sqlite3: Bundle 3.8.6 for Mac and Windows 2014-10-16 17:38:45 +02:00
csync.c Merge remote-tracking branch 'origin/il' 2014-11-08 10:48:36 +01:00
csync.h SyncEngine: Better reporting when ignoring hardlinks. #2217 2014-09-18 11:32:29 +02:00
csync_exclude.c Ignore reserved words on Windows 2014-10-24 13:18:57 -04:00
csync_exclude.h Ignore reserved words on Windows 2014-10-24 13:18:57 -04:00
csync_log.c Make it compile with the merge of csync mirall 2014-01-15 12:20:03 +01:00
csync_log.h Move csync in order to merge it with mirall 2014-01-13 14:39:50 +01:00
csync_macros.h Move csync in order to merge it with mirall 2014-01-13 14:39:50 +01:00
csync_misc.c CSync: Remove more unused things 2014-06-04 11:19:09 +02:00
csync_misc.h CSync: Remove more unused things 2014-06-04 11:19:09 +02:00
csync_owncloud.c Merge remote-tracking branch 'origin/il' 2014-11-08 10:48:36 +01:00
csync_owncloud.h CSync: Use context instead of global variable 2014-06-03 11:51:12 +02:00
csync_owncloud_private.h csync_owncloud: fix the name of the permissions property 2014-07-18 16:52:04 +02:00
csync_owncloud_recursive_propfind.c Update phase progress: Check if callback is defined. 2014-08-18 11:51:45 +02:00
csync_owncloud_util.c Merge remote-tracking branch 'origin/il' 2014-11-08 10:48:36 +01:00
csync_private.h Merge remote-tracking branch 'origin/il' 2014-11-08 10:48:36 +01:00
csync_reconcile.c csync_reconcile: remove useless debug output 2014-10-21 11:47:18 +02:00
csync_reconcile.h Move csync in order to merge it with mirall 2014-01-13 14:39:50 +01:00
csync_rename.cc Removed unused function. 2014-02-07 11:57:10 +01:00
csync_rename.h Move csync in order to merge it with mirall 2014-01-13 14:39:50 +01:00
csync_statedb.c SyncJournalDB: Add filesize column to metadata. 2014-10-29 09:53:36 +01:00
csync_statedb.h CSync: Close/Reopen DB between update and reconcile 2014-10-22 15:42:13 +02:00
csync_time.c csync: Remove time_sync_required 2014-02-27 13:12:21 +01:00
csync_time.h csync: Remove time_sync_required 2014-02-27 13:12:21 +01:00
csync_update.c Merge remote-tracking branch 'origin/il' 2014-11-08 10:48:36 +01:00
csync_update.h Move csync in order to merge it with mirall 2014-01-13 14:39:50 +01:00
csync_util.c Silent some warnings 2014-08-12 14:03:04 +02:00
csync_util.h CSync: Simplify csync_owncloud stat/resource handling 2014-06-03 11:51:12 +02:00
csync_version.h.in Move csync in order to merge it with mirall 2014-01-13 14:39:50 +01:00