Olivier Goffart b1ac67ce8b Always consider that the conflict should happen on the locale ... Don't take in account which file is newer, the conflict file will always be on the locale side. This patch also consider that INSTRUCTION_NEW and INSTRUCTION_EVAL means the same.		2013-05-07 10:48:44 +02:00
..
httpbf	Revert "Fix httpbf test."	2013-05-06 16:13:58 +02:00
std	Do not use asprintf any more, added missing header.	2013-04-22 14:30:57 +02:00
vio	Check for null argument.	2013-05-04 16:08:49 +02:00
CMakeLists.txt	Generate csync version from CMake variables	2013-04-25 12:32:01 +02:00
csync.c	Put the lock file into the sync dir.	2013-05-04 16:10:11 +02:00
csync.h	Put the lock file into the sync dir.	2013-05-04 16:10:11 +02:00
csync_config.c	Allow to configure the timeout in the config	2013-02-13 18:25:28 +01:00
csync_config.h	Document csync_config_load().	2009-05-22 20:19:06 +02:00
csync_dbtree.c	Fix removing of folder when the folder is locked on windows.	2013-02-13 19:20:26 +01:00
csync_dbtree.h	Added functions to read the file tree from database.	2012-08-23 17:48:24 +03:00
csync_exclude.c	Put the lock file into the sync dir.	2013-05-04 16:10:11 +02:00
csync_exclude.h	Improve the documentation of csync_excluded().	2009-05-22 20:21:20 +02:00
csync_lock.c	Push WIN32 preprocessor derectives to csync_lock.c.	2013-04-22 14:30:12 +02:00
csync_lock.h	csync: Add a new logging system.	2012-10-30 11:27:21 +01:00
csync_log.c	Shorten log line a bit by removing the year part of the date.	2012-12-06 11:34:26 +01:00
csync_log.h	Removed old log callback code.	2012-12-03 19:41:44 +01:00
csync_macros.h	Added new error types for service unavail, quoto and file too big.	2013-01-13 21:39:54 +01:00
csync_misc.c	Added csync_commit to be able to reuse the csync context.	2013-04-20 12:11:16 +03:00
csync_misc.h	Resume chunked upload if conneciton is lost	2013-03-12 11:42:17 +01:00
csync_private.h	Fix too many PROPFIND when starting a sync	2013-05-03 19:21:21 +02:00
csync_propagate.c	Do not fetch folder id after propagation.	2013-05-03 19:21:21 +02:00
csync_propagate.h	Do not fetch folder id after propagation.	2013-05-03 19:21:21 +02:00
csync_reconcile.c	Always consider that the conflict should happen on the locale	2013-05-07 10:48:44 +02:00
csync_reconcile.h	Fix the documentation of the reconciliation.	2009-05-25 12:58:00 +02:00
csync_statedb.c	Don't reset the md5 if the mtime change locally.	2013-05-03 19:21:21 +02:00
csync_statedb.h	Resume chunked upload if conneciton is lost	2013-03-12 11:42:17 +01:00
csync_time.c	Moved error_code to context for thread savety.	2012-07-09 13:25:46 +02:00
csync_time.h	Moved error_code to context for thread savety.	2012-07-09 13:25:46 +02:00
csync_update.c	Don't reset the md5 if the mtime change locally.	2013-05-03 19:21:21 +02:00
csync_update.h	Add a group for update detection functions.	2009-05-25 11:58:31 +02:00
csync_util.c	Fix too many PROPFIND when starting a sync	2013-05-03 19:21:21 +02:00
csync_util.h	Win32: Hide file while downloading	2012-12-10 19:15:16 +01:00
csync_version.h.in	Generate csync version from CMake variables	2013-04-25 12:32:01 +02:00