Olivier Goffart 316aade340 Merge branch 'csync_merge' ... Conflicts: src/CMakeLists.txt		2014-01-20 13:27:33 +01:00
..
modules	Merge branch 'csync_merge'	2014-01-20 13:27:33 +01:00
scripts	Move csync in order to merge it with mirall	2014-01-13 14:39:50 +01:00