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
..
modules	Merge remote-tracking branch 'origin/1.6' into il	2014-06-23 12:48:34 +02:00
scripts	Move csync in order to merge it with mirall	2014-01-13 14:39:50 +01:00