diff options
author | Chandler Carruth <chandlerc@gmail.com> | 2019-01-19 08:50:56 +0000 |
---|---|---|
committer | Chandler Carruth <chandlerc@gmail.com> | 2019-01-19 08:50:56 +0000 |
commit | 2946cd701067404b99c39fb29dc9c74bd7193eb3 (patch) | |
tree | 48c6e62c93e00b952a459e587d14357943b2b594 /clang/tools/clang-format | |
parent | d6317d22a92d596731b1dd9d4a8010879f3e43d9 (diff) | |
download | bcm5719-llvm-2946cd701067404b99c39fb29dc9c74bd7193eb3.tar.gz bcm5719-llvm-2946cd701067404b99c39fb29dc9c74bd7193eb3.zip |
Update the file headers across all of the LLVM projects in the monorepo
to reflect the new license.
We understand that people may be surprised that we're moving the header
entirely to discuss the new license. We checked this carefully with the
Foundation's lawyer and we believe this is the correct approach.
Essentially, all code in the project is now made available by the LLVM
project under our new license, so you will see that the license headers
include that license only. Some of our contributors have contributed
code under our old license, and accordingly, we have retained a copy of
our old license notice in the top-level files in each project and
repository.
llvm-svn: 351636
Diffstat (limited to 'clang/tools/clang-format')
-rw-r--r-- | clang/tools/clang-format/ClangFormat.cpp | 7 | ||||
-rwxr-xr-x | clang/tools/clang-format/clang-format-diff.py | 7 | ||||
-rw-r--r-- | clang/tools/clang-format/clang-format-test.el | 5 | ||||
-rw-r--r-- | clang/tools/clang-format/fuzzer/ClangFormatFuzzer.cpp | 7 | ||||
-rwxr-xr-x | clang/tools/clang-format/git-clang-format | 7 |
5 files changed, 15 insertions, 18 deletions
diff --git a/clang/tools/clang-format/ClangFormat.cpp b/clang/tools/clang-format/ClangFormat.cpp index 49162d0d910..9e0ce71d7f1 100644 --- a/clang/tools/clang-format/ClangFormat.cpp +++ b/clang/tools/clang-format/ClangFormat.cpp @@ -1,9 +1,8 @@ //===-- clang-format/ClangFormat.cpp - Clang format tool ------------------===// // -// 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 // //===----------------------------------------------------------------------===// /// diff --git a/clang/tools/clang-format/clang-format-diff.py b/clang/tools/clang-format/clang-format-diff.py index d6d35104161..919c09bd9d2 100755 --- a/clang/tools/clang-format/clang-format-diff.py +++ b/clang/tools/clang-format/clang-format-diff.py @@ -2,10 +2,9 @@ # #===- clang-format-diff.py - ClangFormat Diff Reformatter ----*- python -*--===# # -# 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 # #===------------------------------------------------------------------------===# diff --git a/clang/tools/clang-format/clang-format-test.el b/clang/tools/clang-format/clang-format-test.el index 0e1f4dde406..0defe7452cb 100644 --- a/clang/tools/clang-format/clang-format-test.el +++ b/clang/tools/clang-format/clang-format-test.el @@ -4,8 +4,9 @@ ;; Author: Philipp Stephani <phst@google.com> -;; 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 ;;; Commentary: diff --git a/clang/tools/clang-format/fuzzer/ClangFormatFuzzer.cpp b/clang/tools/clang-format/fuzzer/ClangFormatFuzzer.cpp index 0c9ae848d59..d39d8da0ccb 100644 --- a/clang/tools/clang-format/fuzzer/ClangFormatFuzzer.cpp +++ b/clang/tools/clang-format/fuzzer/ClangFormatFuzzer.cpp @@ -1,9 +1,8 @@ //===-- ClangFormatFuzzer.cpp - Fuzz the Clang format tool ----------------===// // -// 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 // //===----------------------------------------------------------------------===// /// diff --git a/clang/tools/clang-format/git-clang-format b/clang/tools/clang-format/git-clang-format index 96e3b4e8a2c..2696d099e4c 100755 --- a/clang/tools/clang-format/git-clang-format +++ b/clang/tools/clang-format/git-clang-format @@ -2,10 +2,9 @@ # #===- git-clang-format - ClangFormat Git Integration ---------*- python -*--===# # -# 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 # #===------------------------------------------------------------------------===# |