Merge branch 'master' of framagit.org:simgrid/simgrid

[simgrid.git] / MANIFEST.in

diff --git a/MANIFEST.in b/MANIFEST.in
index 16fc6c9..53b252d 100644 (file)
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1738,6 +1738,10 @@ 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
@@ -1804,6 +1808,7 @@ include doc/doxygen/uhood.doc
 include doc/doxygen/uhood_arch.doc
 include doc/doxygen/uhood_switch.doc
 include docs/Build.sh
+include docs/bin/extract_logs_hierarchy.pl
 include docs/find-missing.ignore
 include docs/find-missing.py
 include docs/ignored_symbols
@@ -2777,7 +2782,6 @@ include tools/cmake/test_prog/prog_stackgrowth.c
 include tools/cmake/test_prog/prog_stacksetup.c
 include tools/cmake/test_prog/prog_tsan.cpp
 include tools/doxygen/list_routing_models_examples.sh
-include tools/doxygen/xbt_log_extract_hierarchy.pl
 include tools/graphicator/CMakeLists.txt
 include tools/lualib.patch
 include tools/smpi/generate_smpi_defines.pl