Olivier Goffart 02704cdf74 Merge remote-tracking branch 'origin/1.6' into il ... Conflicts: VERSION.cmake csync/src/csync_statedb.c src/mirall/syncengine.cpp src/mirall/syncfileitem.h		2014-06-23 12:48:34 +02:00
..
c_alloc.c	Move csync in order to merge it with mirall	2014-01-13 14:39:50 +01:00
c_alloc.h	Move csync in order to merge it with mirall	2014-01-13 14:39:50 +01:00
c_jhash.h	Move csync in order to merge it with mirall	2014-01-13 14:39:50 +01:00
c_lib.h	CSync: Remove unused std functions	2014-06-04 10:33:19 +02:00
c_list.c	Move csync in order to merge it with mirall	2014-01-13 14:39:50 +01:00
c_list.h	Move csync in order to merge it with mirall	2014-01-13 14:39:50 +01:00
c_macro.h	Remove misleading error message of "unknown error" for custom errnos.	2014-05-13 10:39:37 +02:00
c_path.c	CSync: Remove unused std functions	2014-06-04 10:33:19 +02:00
c_path.h	CSync: Remove unused std functions	2014-06-04 10:33:19 +02:00
c_private.h	Make it compile with the merge of csync mirall	2014-01-15 12:20:03 +01:00
c_rbtree.c	Move csync in order to merge it with mirall	2014-01-13 14:39:50 +01:00
c_rbtree.h	Move csync in order to merge it with mirall	2014-01-13 14:39:50 +01:00
c_string.c	CSync: Remove unused std functions	2014-06-04 10:33:19 +02:00
c_string.h	CSync: Remove unused std functions	2014-06-04 10:33:19 +02:00
c_time.c	c_time: Fix resource leak in error case	2014-06-20 10:58:03 +02:00
c_time.h	Move csync in order to merge it with mirall	2014-01-13 14:39:50 +01:00
CMakeLists.txt	CSync: Remove unused std functions	2014-06-04 10:33:19 +02:00