Merge pull request #3591 from directhex/mono_libdir_fallback

author Bernhard Urban <bernhard.urban@xamarin.com>

Thu, 13 Oct 2016 14:39:38 +0000 (16:39 +0200)

committer GitHub <noreply@github.com>

Thu, 13 Oct 2016 14:39:38 +0000 (16:39 +0200)
author Bernhard Urban <bernhard.urban@xamarin.com>
Thu, 13 Oct 2016 14:39:38 +0000 (16:39 +0200)
committer GitHub <noreply@github.com>
Thu, 13 Oct 2016 14:39:38 +0000 (16:39 +0200)
diff --cc configure.ac
Simple merge
diff --cc mono/metadata/Makefile.am
Simple merge
diff --cc mono/metadata/assembly.c
Simple merge
diff --cc mono/metadata/assembly.h
Simple merge
author	Bernhard Urban <bernhard.urban@xamarin.com>
	Thu, 13 Oct 2016 14:39:38 +0000 (16:39 +0200)
committer	GitHub <noreply@github.com>
	Thu, 13 Oct 2016 14:39:38 +0000 (16:39 +0200)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
mono/metadata/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
mono/metadata/assembly.c	patch \|	diff1 \|	diff2 \|	blob \| history
mono/metadata/assembly.h	patch \|	diff1 \|	diff2 \|	blob \| history