Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge branch 'master' of https://framagit.org/simgrid/simgrid into no_simix_global
authorSUTER Frederic <frederic.suter@cc.in2p3.fr>
Tue, 14 Sep 2021 11:31:02 +0000 (13:31 +0200)
committerSUTER Frederic <frederic.suter@cc.in2p3.fr>
Tue, 14 Sep 2021 11:39:51 +0000 (13:39 +0200)
commit237fd22b56db7d1c67360c37559ce3aab16a002d
treebd71a1e9728803eac22c978b9b2e518d7af9b642
parentbf8254c73ee9f0bd8f13cdadac15c9d328a276b4
parent97b7c2c06ad7a973844e0b10ad31d88babfb1cf6
Merge branch 'master' of https://framagit.org/simgrid/simgrid into no_simix_global
src/kernel/EngineImpl.cpp
src/kernel/EngineImpl.hpp
src/s4u/s4u_Engine.cpp
src/simix/smx_global.cpp
src/simix/smx_private.hpp