Merge pull request #5428 from kumpera/wasm-support-p2

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

Fri, 8 Sep 2017 18:55:38 +0000 (14:55 -0400)

committer GitHub <noreply@github.com>

Fri, 8 Sep 2017 18:55:38 +0000 (14:55 -0400)
author Rodrigo Kumpera <kumpera@users.noreply.github.com>
Fri, 8 Sep 2017 18:55:38 +0000 (14:55 -0400)
committer GitHub <noreply@github.com>
Fri, 8 Sep 2017 18:55:38 +0000 (14:55 -0400)
diff --cc configure.ac
Simple merge
diff --cc mono/metadata/object.c
Simple merge
diff --cc mono/mini/mini-exceptions.c
Simple merge
diff --cc mono/sgen/sgen-gc.c
Simple merge
author	Rodrigo Kumpera <kumpera@users.noreply.github.com>
	Fri, 8 Sep 2017 18:55:38 +0000 (14:55 -0400)
committer	GitHub <noreply@github.com>
	Fri, 8 Sep 2017 18:55:38 +0000 (14:55 -0400)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
mono/metadata/object.c	patch \|	diff1 \|	diff2 \|	blob \| history
mono/mini/mini-exceptions.c	patch \|	diff1 \|	diff2 \|	blob \| history
mono/sgen/sgen-gc.c	patch \|	diff1 \|	diff2 \|	blob \| history