Olivier Goffart 8a88ca6f34 Merge branch 'il' ... Conflicts: src/mirall/propagator_legacy.h		2014-07-18 17:00:38 +02:00
..
modules	Merge branch 'il'	2014-07-18 17:00:38 +02:00
scripts	Move csync in order to merge it with mirall	2014-01-13 14:39:50 +01:00