Merge pull request #4618 from BrzVlad/feature-par-nrs

author Vlad Brezae <brezaevlad@gmail.com>

Tue, 4 Apr 2017 22:13:00 +0000 (01:13 +0300)

committer GitHub <noreply@github.com>

Tue, 4 Apr 2017 22:13:00 +0000 (01:13 +0300)
author Vlad Brezae <brezaevlad@gmail.com>
Tue, 4 Apr 2017 22:13:00 +0000 (01:13 +0300)
committer GitHub <noreply@github.com>
Tue, 4 Apr 2017 22:13:00 +0000 (01:13 +0300)
diff --cc mono/sgen/sgen-gc.c
Simple merge
diff --cc mono/sgen/sgen-gc.h
Simple merge
author	Vlad Brezae <brezaevlad@gmail.com>
	Tue, 4 Apr 2017 22:13:00 +0000 (01:13 +0300)
committer	GitHub <noreply@github.com>
	Tue, 4 Apr 2017 22:13:00 +0000 (01:13 +0300)
		1	2
mono/sgen/sgen-gc.c	patch \|	diff1 \|	diff2 \|	blob \| history
mono/sgen/sgen-gc.h	patch \|	diff1 \|	diff2 \|	blob \| history