Merge branch 'S4U'

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

Tue, 13 Oct 2015 22:06:18 +0000 (00:06 +0200)

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

Tue, 13 Oct 2015 22:06:18 +0000 (00:06 +0200)
author Martin Quinson <martin.quinson@loria.fr>
Tue, 13 Oct 2015 22:06:18 +0000 (00:06 +0200)
committer Martin Quinson <martin.quinson@loria.fr>
Tue, 13 Oct 2015 22:06:18 +0000 (00:06 +0200)
diff --cc include/simgrid/msg.h
Simple merge
diff --cc tools/cmake/DefinePackages.cmake
Simple merge
diff --cc tools/cmake/Distrib.cmake
Simple merge
diff --cc tools/cmake/Tests.cmake
Simple merge
author	Martin Quinson <martin.quinson@loria.fr>
	Tue, 13 Oct 2015 22:06:18 +0000 (00:06 +0200)
committer	Martin Quinson <martin.quinson@loria.fr>
	Tue, 13 Oct 2015 22:06:18 +0000 (00:06 +0200)
		1	2
include/simgrid/msg.h	patch \|	diff1 \|	diff2 \|	blob \| history
tools/cmake/DefinePackages.cmake	patch \|	diff1 \|	diff2 \|	blob \| history
tools/cmake/Distrib.cmake	patch \|	diff1 \|	diff2 \|	blob \| history
tools/cmake/Tests.cmake	patch \|	diff1 \|	diff2 \|	blob \| history