Merge remote-tracking branch 'upstream/master' into from-tfs
authordotnet-bot <dotnet-bot@microsoft.com>
Fri, 20 May 2016 17:53:17 +0000 (10:53 -0700)
committerPat Gavlin <pagavlin@microsoft.com>
Fri, 20 May 2016 17:53:52 +0000 (10:53 -0700)
commit6a84a4aa0c08f7db816cdd8eed9e2ecbcc877f52
tree40c57bb10201420b958f13086cb1e7e3416553d0
parenta2728758512f4b13d50fd44f9be43cdb48bd7567
parent3c61cb45c73ec7dd156475f95853abb2a6d74af0
Merge remote-tracking branch 'upstream/master' into from-tfs
src/vm/jitinterface.cpp
src/vm/jitinterface.h