Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
No need to make a simcall on mutex creation.
[simgrid.git] / MANIFEST.in
index 53b252d..7620882 100644 (file)
@@ -1738,10 +1738,6 @@ include teshsuite/xbt/signals/signals.tesh
 include tools/MSG_visualization/colorize.pl
 include tools/MSG_visualization/trace2fig.pl
 include tools/address_sanitizer.supp
-<<<<<<< HEAD
-include tools/doxygen/fig2dev_postprocessor.pl
-=======
->>>>>>> 0e860ce2fbd8d2781d6c1129bb41cb788380f398
 include tools/fix-paje-trace.sh
 include tools/generate-dwarf-functions
 include tools/graphicator/graphicator.cpp
@@ -2303,8 +2299,8 @@ include src/mc/inspect/mc_member.cpp
 include src/mc/inspect/mc_unw.cpp
 include src/mc/inspect/mc_unw.hpp
 include src/mc/inspect/mc_unw_vmread.cpp
-include src/mc/mc_api.cpp
-include src/mc/mc_api.hpp
+include src/mc/api.cpp
+include src/mc/api.hpp
 include src/mc/mc_base.cpp
 include src/mc/mc_base.h
 include src/mc/mc_client_api.cpp