diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2019-08-22 19:14:02 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2019-08-22 19:14:02 +0000 |
| commit | 580d4aa65a2dadf52a0abc9451ab25918cb25125 (patch) | |
| tree | f57af07970c6653570799c317a2ebcf8ea056a10 /contrib/llvm/tools/lldb/source/Target/ModuleCache.cpp | |
| parent | 22d1794578bafc3a0f25691c0531ba10d57713e6 (diff) | |
| parent | 5f29bb8a675e8f96452b632e7129113f7dec850e (diff) | |
Merge lldb trunk r366426, resolve conflicts, and update FREEBSD-Xlist.
Notes
Notes:
svn path=/projects/clang900-import/; revision=351400
Diffstat (limited to 'contrib/llvm/tools/lldb/source/Target/ModuleCache.cpp')
| -rw-r--r-- | contrib/llvm/tools/lldb/source/Target/ModuleCache.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/contrib/llvm/tools/lldb/source/Target/ModuleCache.cpp b/contrib/llvm/tools/lldb/source/Target/ModuleCache.cpp index daf787b1fb22..444c9806f98b 100644 --- a/contrib/llvm/tools/lldb/source/Target/ModuleCache.cpp +++ b/contrib/llvm/tools/lldb/source/Target/ModuleCache.cpp @@ -1,9 +1,8 @@ //===--------------------- ModuleCache.cpp ----------------------*- C++ -*-===// // -// The LLVM Compiler Infrastructure -// -// This file is distributed under the University of Illinois Open Source -// License. See LICENSE.TXT for details. +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // //===----------------------------------------------------------------------===// |