diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-09-01 14:08:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-01 14:08:13 +0200 |
| commit | cd438d56626c012f19257d8ac52eaa7c8033d4cf (patch) | |
| tree | 6b51d9ffe95a78fe99a60f8f31908ebd5067e122 | |
| parent | df73d26314382829e4a7668bc254d7e11bc31f7d (diff) | |
| parent | 6f2977f9c394d3489a1377f0a3d63caa15bddab1 (diff) | |
Merge pull request #21656 from ibrahn/fixup-license-shortnames
Fixed up a couple of license names in COPYRIGHT.txt
| -rw-r--r-- | COPYRIGHT.txt | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt index 4ba80941e0..49c602eb84 100644 --- a/COPYRIGHT.txt +++ b/COPYRIGHT.txt @@ -10,8 +10,9 @@ # all corresponding files (also recursively in subfolders), apart from those # with a more explicit copyright statement. # -# Licenses are given with their SPDX identifier, and are all included in -# plain text at the end of this file (in alphabetical order). +# Licenses are given with their debian/copyright short name (or SPDX identifier +# if no standard short name exists) and are all included in plain text at the +# end of this file (in alphabetical order). # # Disclaimer for thirdparty libraries: # ------------------------------------ @@ -139,7 +140,7 @@ Files: ./thirdparty/cvtt/ Comment: Convection Texture Tools Stand-Alone Kernels Copyright: 2018, Eric Lasota 2018, Microsoft Corp. -License: MIT +License: Expat Files: ./thirdparty/enet/ Comment: ENet @@ -373,7 +374,7 @@ Files: ./thirdparty/tinyexr/ Comment: TinyEXR Copyright: 2014-2017, Syoyo Fujita 2002, Industrial Light & Magic, a division of Lucas Digital Ltd. LLC -License: BSD-3-Clause +License: BSD-3-clause Files: ./thirdparty/zlib/ Comment: zlib @@ -383,7 +384,7 @@ License: Zlib Files: ./thirdparty/zstd/ Comment: Zstandard Copyright: 2016-2018, Facebook, Inc. -License: BSD-3-Clause +License: BSD-3-clause |