Merge changes from parent branch
authordotnet-bot <dotnet-bot@microsoft.com>
Wed, 8 Apr 2015 00:23:32 +0000 (17:23 -0700)
committerdotnet-bot <dotnet-bot@microsoft.com>
Wed, 8 Apr 2015 00:23:32 +0000 (17:23 -0700)
commitf1c0c7d95164abbbc4dfbd5bc312ef543256b0e0
tree7a7156b56e9b9283ae0668491157bf1526077a3a
parent1afe5ce4f45045d724a4e129df4b816655d486fb
Merge changes from parent branch

[tfs-changeset: 1448103]
51 files changed:
src/ToolBox/SOS/Strike/DisasmARM.cpp
src/ToolBox/SOS/Strike/DisasmARM64.cpp
src/ToolBox/SOS/Strike/disasm.cpp
src/debug/di/process.cpp
src/dirs.proj
src/dlls/mscoree/mscoree.settings.targets
src/gc/gc.cpp
src/gc/gcimpl.h
src/gc/gcpriv.h
src/gc/gcrecord.h
src/gc/objecthandle.cpp
src/inc/corprof.idl
src/inc/eventtrace.h
src/inc/eventtracebase.h
src/inc/fxretarget.h
src/inc/stdmacros.h
src/jit/assertionprop.cpp
src/jit/codegencommon.cpp
src/jit/codegenxarch.cpp
src/jit/compiler.h
src/jit/flowgraph.cpp
src/jit/gentree.cpp
src/jit/gentree.h
src/jit/lsra.cpp
src/jit/lsra.h
src/jit/morph.cpp
src/jit/optimizer.cpp
src/jit/rangecheck.cpp
src/jit/simdcodegenxarch.cpp
src/mscorlib/src/System/Diagnostics/Eventing/FrameworkEventSource.cs
src/mscorlib/src/System/Environment.cs
src/mscorlib/src/System/Globalization/CultureInfo.cs
src/mscorlib/src/System/Globalization/DateTimeFormat.cs
src/mscorlib/src/System/Globalization/DateTimeParse.cs
src/mscorlib/src/System/Resources/ResourceManager.cs
src/mscorlib/src/System/Runtime/CompilerServices/TaskAwaiter.cs
src/mscorlib/src/System/Security/Permissions/FileIOPermission.cs
src/mscorlib/src/System/String.cs
src/mscorlib/src/System/Threading/ExecutionContext.cs
src/mscorlib/src/System/Threading/Tasks/Task.cs
src/tools/crossgen/crossgen.nativeproj
src/vm/ClrEtwAll.man
src/vm/ClrEtwAllMeta.lst
src/vm/ceemain.cpp
src/vm/codeman.cpp
src/vm/eventtrace.cpp
src/vm/gcinfodecoder.cpp
src/vm/jitinterface.cpp
src/vm/rejit.cpp
src/zap/zapimage.cpp
src/zap/zapper.cpp