Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
authorMartin Quinson <martin.quinson@loria.fr>
Tue, 27 Mar 2018 19:50:05 +0000 (21:50 +0200)
committerMartin Quinson <martin.quinson@loria.fr>
Tue, 27 Mar 2018 20:58:01 +0000 (22:58 +0200)
commitfaedb72df7cffcf486677835fdd57d319a010bb1
tree1a0c798c39a55360d4a76290b9587fae4af13673
parent8a183d28b661a9c91773b363ce3039d1e1b89982
parent39d24b63aa597b0ee886e0f98b2755eb27924b3e
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
include/simgrid/kernel/resource/Model.hpp
src/kernel/resource/Model.cpp
src/surf/cpu_cas01.cpp
src/surf/network_cm02.cpp