Merge pull request #2422 from akoeplinger/environment-is64bitoperatingsystem

author João Matos <joao@tritao.eu>

Wed, 13 Jan 2016 01:55:01 +0000 (01:55 +0000)

committer João Matos <joao@tritao.eu>

Wed, 13 Jan 2016 01:55:01 +0000 (01:55 +0000)
author João Matos <joao@tritao.eu>
Wed, 13 Jan 2016 01:55:01 +0000 (01:55 +0000)
committer João Matos <joao@tritao.eu>
Wed, 13 Jan 2016 01:55:01 +0000 (01:55 +0000)
diff --cc mcs/class/corlib/System/Environment.cs
Simple merge
diff --cc mono/metadata/icall-def.h
Simple merge
diff --cc mono/metadata/icall.c
Simple merge
author	João Matos <joao@tritao.eu>
	Wed, 13 Jan 2016 01:55:01 +0000 (01:55 +0000)
committer	João Matos <joao@tritao.eu>
	Wed, 13 Jan 2016 01:55:01 +0000 (01:55 +0000)
		1	2
mcs/class/corlib/System/Environment.cs	patch \|	diff1 \|	diff2 \|	blob \| history
mono/metadata/icall-def.h	patch \|	diff1 \|	diff2 \|	blob \| history
mono/metadata/icall.c	patch \|	diff1 \|	diff2 \|	blob \| history