diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2016-01-28 09:14:42 +0300 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2016-01-28 09:14:42 +0300 |
| commit | c17eede497f1eac3218ebb6b3e8d8c6c13f1aca2 (patch) | |
| tree | d0e3ed8515a9554b308dccc0df2514d23a8f0840 /src/Native/Runtime/PalRedhawkFunctions.h | |
| parent | 7ba5245c66aa2eb84c1a2f521e70190abc13b728 (diff) | |
| parent | 66be1d989b56c3158bfeb442ebfd4a1d88039c1b (diff) | |
Merge branch 'nmirror' into nmirror_merge
Conflicts:
src/Common/src/Interop/Windows/mincore/Interop.MEMORY_BASIC_INFORMATION.cs
src/ILCompiler.Compiler/src/Compiler/PdbSymbolProvider.cs
src/Native/Bootstrap/platform.h
src/Native/Bootstrap/platform.windows.cpp
src/Native/gc/env/gcenv.windows.cpp
src/System.Private.CoreLib/src/Internal/Runtime/CompilerHelpers/ArrayMethodILHelpers.cs
tests/src/Simple/AsgAdd1/AsgAdd1.cs
Diffstat (limited to 'src/Native/Runtime/PalRedhawkFunctions.h')
| -rw-r--r-- | src/Native/Runtime/PalRedhawkFunctions.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/Native/Runtime/PalRedhawkFunctions.h b/src/Native/Runtime/PalRedhawkFunctions.h index d15c46bd1..e301e2a77 100644 --- a/src/Native/Runtime/PalRedhawkFunctions.h +++ b/src/Native/Runtime/PalRedhawkFunctions.h @@ -1,7 +1,6 @@ -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. -// +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. extern "C" UInt16 __stdcall CaptureStackBackTrace(UInt32, UInt32, void*, UInt32*); inline UInt16 PalCaptureStackBackTrace(UInt32 arg1, UInt32 arg2, void* arg3, UInt32* arg4) |