Merge pull request #3019 from schani/fix-major-pinning

author Mark Probst <mark.probst@gmail.com>

Tue, 31 May 2016 18:03:43 +0000 (11:03 -0700)

committer Mark Probst <mark.probst@gmail.com>

Tue, 31 May 2016 18:03:43 +0000 (11:03 -0700)
author Mark Probst <mark.probst@gmail.com>
Tue, 31 May 2016 18:03:43 +0000 (11:03 -0700)
committer Mark Probst <mark.probst@gmail.com>
Tue, 31 May 2016 18:03:43 +0000 (11:03 -0700)
diff --cc mono/metadata/sgen-mono.c
Simple merge
diff --cc mono/sgen/sgen-gc.c
Simple merge
diff --cc mono/sgen/sgen-gc.h
Simple merge
author	Mark Probst <mark.probst@gmail.com>
	Tue, 31 May 2016 18:03:43 +0000 (11:03 -0700)
committer	Mark Probst <mark.probst@gmail.com>
	Tue, 31 May 2016 18:03:43 +0000 (11:03 -0700)
		1	2
mono/metadata/sgen-mono.c	patch \|	diff1 \|	diff2 \|	blob \| history
mono/sgen/sgen-gc.c	patch \|	diff1 \|	diff2 \|	blob \| history
mono/sgen/sgen-gc.h	patch \|	diff1 \|	diff2 \|	blob \| history