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

author Frederic Suter <frederic.suter@cc.in2p3.fr>

Thu, 5 Dec 2019 08:14:40 +0000 (09:14 +0100)

committer Frederic Suter <frederic.suter@cc.in2p3.fr>

Thu, 5 Dec 2019 08:14:40 +0000 (09:14 +0100)
author Frederic Suter <frederic.suter@cc.in2p3.fr>
Thu, 5 Dec 2019 08:14:40 +0000 (09:14 +0100)
committer Frederic Suter <frederic.suter@cc.in2p3.fr>
Thu, 5 Dec 2019 08:14:40 +0000 (09:14 +0100)
diff --cc MANIFEST.in
Simple merge
diff --cc src/simgrid/sg_config.cpp
Simple merge
diff --cc tools/cmake/DefinePackages.cmake
Simple merge
author	Frederic Suter <frederic.suter@cc.in2p3.fr>
	Thu, 5 Dec 2019 08:14:40 +0000 (09:14 +0100)
committer	Frederic Suter <frederic.suter@cc.in2p3.fr>
	Thu, 5 Dec 2019 08:14:40 +0000 (09:14 +0100)
		1	2
MANIFEST.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/simgrid/sg_config.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
tools/cmake/DefinePackages.cmake	patch \|	diff1 \|	diff2 \|	blob \| history