From: Gabriel Corona <gabriel.corona@loria.fr>
Date: Fri, 25 Jul 2014 11:28:50 +0000 (+0200)
Subject: Merge branch 'mc'
X-Git-Tag: v3_12~890^2~1
X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/c57842fe897f53b46f0be3da87f7c996674be7d6

Merge branch 'mc'

Conflicts:
	src/mc/mc_compare.cpp
---

c57842fe897f53b46f0be3da87f7c996674be7d6