Merge pull request #5560 from kumpera/wasm-work-p3

author Rodrigo Kumpera <kumpera@users.noreply.github.com>

Thu, 28 Sep 2017 22:06:02 +0000 (18:06 -0400)

committer GitHub <noreply@github.com>

Thu, 28 Sep 2017 22:06:02 +0000 (18:06 -0400)
author Rodrigo Kumpera <kumpera@users.noreply.github.com>
Thu, 28 Sep 2017 22:06:02 +0000 (18:06 -0400)
committer GitHub <noreply@github.com>
Thu, 28 Sep 2017 22:06:02 +0000 (18:06 -0400)
diff --cc mono/metadata/object.c
Simple merge
diff --cc mono/metadata/sgen-mono.c
Simple merge
diff --cc mono/mini/mini-exceptions.c
Simple merge
diff --cc mono/mini/mini-runtime.c
Simple merge
diff --cc mono/mini/mini.h
Simple merge
author	Rodrigo Kumpera <kumpera@users.noreply.github.com>
	Thu, 28 Sep 2017 22:06:02 +0000 (18:06 -0400)
committer	GitHub <noreply@github.com>
	Thu, 28 Sep 2017 22:06:02 +0000 (18:06 -0400)
		1	2
mono/metadata/object.c	patch \|	diff1 \|	diff2 \|	blob \| history
mono/metadata/sgen-mono.c	patch \|	diff1 \|	diff2 \|	blob \| history
mono/mini/mini-exceptions.c	patch \|	diff1 \|	diff2 \|	blob \| history
mono/mini/mini-runtime.c	patch \|	diff1 \|	diff2 \|	blob \| history
mono/mini/mini.h	patch \|	diff1 \|	diff2 \|	blob \| history