Olivier Goffart 81d786733d Merge remote-tracking branch 'origin/1.6' into il ... Conflicts: VERSION.cmake src/mirall/propagator_qnam.cpp src/mirall/propagator_qnam.h		2014-07-18 16:59:29 +02:00
..
modules	Merge remote-tracking branch 'origin/1.6' into il	2014-07-18 16:59:29 +02:00
scripts	Move csync in order to merge it with mirall	2014-01-13 14:39:50 +01:00