Merge pull request #202 from Takishipp/clear_fct

author Martin Quinson <martin.quinson@ens-rennes.fr>

Mon, 24 Jul 2017 20:10:12 +0000 (22:10 +0200)

committer GitHub <noreply@github.com>

Mon, 24 Jul 2017 20:10:12 +0000 (22:10 +0200)
author Martin Quinson <martin.quinson@ens-rennes.fr>
Mon, 24 Jul 2017 20:10:12 +0000 (22:10 +0200)
committer GitHub <noreply@github.com>
Mon, 24 Jul 2017 20:10:12 +0000 (22:10 +0200)
diff --cc src/msg/msg_process.cpp
Simple merge
diff --cc src/smpi/internals/smpi_global.cpp
Simple merge
author	Martin Quinson <martin.quinson@ens-rennes.fr>
	Mon, 24 Jul 2017 20:10:12 +0000 (22:10 +0200)
committer	GitHub <noreply@github.com>
	Mon, 24 Jul 2017 20:10:12 +0000 (22:10 +0200)
		1	2
src/msg/msg_process.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/smpi/internals/smpi_global.cpp	patch \|	diff1 \|	diff2 \|	blob \| history