Merge pull request #3213 from henricm/fix-for-win-securestring-to-bstr

author Niklas Therning <niklas@therning.org>

Wed, 10 Aug 2016 15:04:53 +0000 (17:04 +0200)

committer GitHub <noreply@github.com>

Wed, 10 Aug 2016 15:04:53 +0000 (17:04 +0200)
author Niklas Therning <niklas@therning.org>
Wed, 10 Aug 2016 15:04:53 +0000 (17:04 +0200)
committer GitHub <noreply@github.com>
Wed, 10 Aug 2016 15:04:53 +0000 (17:04 +0200)
diff --cc mono/metadata/icall-def.h
Simple merge
diff --cc mono/metadata/marshal.h
Simple merge
author	Niklas Therning <niklas@therning.org>
	Wed, 10 Aug 2016 15:04:53 +0000 (17:04 +0200)
committer	GitHub <noreply@github.com>
	Wed, 10 Aug 2016 15:04:53 +0000 (17:04 +0200)
		1	2
mono/metadata/icall-def.h	patch \|	diff1 \|	diff2 \|	blob \| history
mono/metadata/marshal.h	patch \|	diff1 \|	diff2 \|	blob \| history