Merge pull request #307 from Jean-Emile/v3.20-expose-simgrid-jni

author Martin Quinson <624847+mquinson@users.noreply.github.com>

Thu, 11 Oct 2018 20:09:28 +0000 (22:09 +0200)

committer GitHub <noreply@github.com>

Thu, 11 Oct 2018 20:09:28 +0000 (22:09 +0200)
author Martin Quinson <624847+mquinson@users.noreply.github.com>
Thu, 11 Oct 2018 20:09:28 +0000 (22:09 +0200)
committer GitHub <noreply@github.com>
Thu, 11 Oct 2018 20:09:28 +0000 (22:09 +0200)
diff --cc ChangeLog
Simple merge
diff --cc include/simgrid/msg.h
Simple merge
author	Martin Quinson <624847+mquinson@users.noreply.github.com>
	Thu, 11 Oct 2018 20:09:28 +0000 (22:09 +0200)
committer	GitHub <noreply@github.com>
	Thu, 11 Oct 2018 20:09:28 +0000 (22:09 +0200)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
include/simgrid/msg.h	patch \|	diff1 \|	diff2 \|	blob \| history