From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Mon, 20 Jun 2016 13:33:32 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
X-Git-Tag: v3_14~933
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/5dc8aedf8d80b2eba1577a7b6087b219709e5f6b?hp=22e39478080f76353996e4151ecf9f725a53cb8c

Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

Conflicts:
	examples/s4u/CMakeLists.txt
---