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
..
modules	Merge remote-tracking branch 'origin/il'	2014-11-08 10:48:36 +01:00
scripts	Move csync in order to merge it with mirall	2014-01-13 14:39:50 +01:00