projects / platform / upstream / coreclr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 81e977c 0870772)
Merge pull request #3335 from dotnet-bot/from-tfs
authorJan Kotas <jkotas@microsoft.com>
Thu, 25 Feb 2016 07:59:25 +0000 (23:59 -0800)
committerJan Kotas <jkotas@microsoft.com>
Thu, 25 Feb 2016 07:59:25 +0000 (23:59 -0800)
Merge changes from TFS

1  2 
src/inc/corinfo.h patch | diff1 | diff2 | blob | history
src/mscorlib/model.xml patch | diff1 | diff2 | blob | history
src/vm/ecalllist.h patch | diff1 | diff2 | blob | history

diff --cc src/inc/corinfo.h
Simple merge
diff --cc src/mscorlib/model.xml
Simple merge
diff --cc src/vm/ecalllist.h
Simple merge