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>
Tue, 26 Apr 2016 20:17:56 +0000 (22:17 +0200)
committerFrederic Suter <frederic.suter@cc.in2p3.fr>
Tue, 26 Apr 2016 20:17:56 +0000 (22:17 +0200)
commit2455643f96166346bf10d16ddc289cc44f1fe78a
treede9324e1d2461aed281ca840c0ce475dd64a536b
parent3b84f2ca2a8d124c4d0c99c44a0f4ef7fac0d855
parenta2c99208d8aff7e234583ccf9b9ffec8024eddd2
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

Conflicts:
tools/cmake/Tests.cmake
tools/cmake/Tests.cmake