Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
authorFrederic Suter <frederic.suter@cc.in2p3.fr>
Mon, 20 Jun 2016 13:33:32 +0000 (15:33 +0200)
committerFrederic Suter <frederic.suter@cc.in2p3.fr>
Mon, 20 Jun 2016 13:33:32 +0000 (15:33 +0200)
Conflicts:
examples/s4u/CMakeLists.txt


Trivial merge