Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge branch 'master' into 'python_bindings_host_load_plugin'
authorMartin Quinson <martin.quinson@ens-rennes.fr>
Wed, 28 Jun 2023 12:32:27 +0000 (12:32 +0000)
committerMartin Quinson <martin.quinson@ens-rennes.fr>
Wed, 28 Jun 2023 12:32:27 +0000 (12:32 +0000)
commit3f756b051175054c62c4741fdab2a6b934828262
tree6a982d2fdb331da5fec234b4fb28e703b8072e5f
parent505d827ccafbb31eb15cfbd72bdc6079e50525e2
parent9af5b0148f1478ec8291537b8a2c8a2d9bc4ac58
Merge branch 'master' into 'python_bindings_host_load_plugin'

# Conflicts:
#   src/bindings/python/simgrid_python.cpp
MANIFEST.in
src/bindings/python/simgrid_python.cpp