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)
# Conflicts:
#   src/bindings/python/simgrid_python.cpp

1  2 
MANIFEST.in
src/bindings/python/simgrid_python.cpp

diff --cc MANIFEST.in
Simple merge