From: Martin Quinson <martin.quinson@loria.fr>
Date: Mon, 10 Oct 2016 12:49:41 +0000 (+0200)
Subject: Merge branches, and adapt the new code to the new refactoring.
X-Git-Tag: v3_14~350
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/c8017d49035c1ccdcd6b49f09162a4836b8d45a8?ds=sidebyside;hp=c8017d49035c1ccdcd6b49f09162a4836b8d45a8

Merge branches, and adapt the new code to the new refactoring.
---