review.tizen.org Git - platform/upstream/coreclr.git/commit

projects / platform / upstream / coreclr.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: d845ef1 2c155d1)

author	Wes Haggard <Wes.Haggard@microsoft.com>
	Fri, 30 Mar 2018 17:00:47 +0000 (10:00 -0700)
committer	Wes Haggard <Wes.Haggard@microsoft.com>
	Fri, 30 Mar 2018 17:00:47 +0000 (10:00 -0700)
commit	3365ac5efe5d6a7ea965ed1d17a5dd5474a033a5
tree	a43d3016ce6dbe8024d171bd4dd9b9a90c3684c9	tree \| snapshot
parent	d845ef1c33f0283d18541714ad9469a7b1a559e6	commit \| diff
parent	2c155d1f01d0a379157913989f2005eebd184c96	commit \| diff

Merge commit 'master' into release/2.1

Merge from sha 2c155d1f01d0a379157913989f2005eebd184c96

Merge conflicts were only in dependency versions which
should get reset after the next build.

buildpipeline/tests/Dotnet-CoreClr-Trusted-BuildTests.json	diff1 \|	diff2 \|	blob \| history
clrdefinitions.cmake	diff1 \|	diff2 \|	blob \| history
dependencies.props	diff1 \|	diff2 \|	blob \| history

Domain: Dotnet / Core;