Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

author Martin Quinson <martin.quinson@loria.fr>

Tue, 21 Nov 2017 23:15:16 +0000 (00:15 +0100)

committer Martin Quinson <martin.quinson@loria.fr>

Tue, 21 Nov 2017 23:15:16 +0000 (00:15 +0100)
author Martin Quinson <martin.quinson@loria.fr>
Tue, 21 Nov 2017 23:15:16 +0000 (00:15 +0100)
committer Martin Quinson <martin.quinson@loria.fr>
Tue, 21 Nov 2017 23:15:16 +0000 (00:15 +0100)
diff --cc .gitignore
Simple merge
diff --cc src/surf/network_interface.cpp
Simple merge
diff --cc tools/cmake/DefinePackages.cmake
Simple merge
author	Martin Quinson <martin.quinson@loria.fr>
	Tue, 21 Nov 2017 23:15:16 +0000 (00:15 +0100)
committer	Martin Quinson <martin.quinson@loria.fr>
	Tue, 21 Nov 2017 23:15:16 +0000 (00:15 +0100)
		1	2
.gitignore	patch \|	diff1 \|	diff2 \|	blob \| history
src/surf/network_interface.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
tools/cmake/DefinePackages.cmake	patch \|	diff1 \|	diff2 \|	blob \| history