diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-06-10 12:59:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-10 12:59:03 +0200 |
| commit | 63e22058c38bb7eda3d8114c7a9c7d032c27c481 (patch) | |
| tree | 01510bb0dec38d2053ba9ad7c8f9c2ecb83982b2 | |
| parent | b2e6fc54b95f5d7bc584fcb6a2c1a73973a0a959 (diff) | |
| parent | 776418942c19f6973739bf17153e18b6281a29fc (diff) | |
Merge pull request #61889 from akien-mga/etcpak-1.0
| -rw-r--r-- | COPYRIGHT.txt | 2 | ||||
| -rw-r--r-- | thirdparty/README.md | 2 | ||||
| -rw-r--r-- | thirdparty/etcpak/AUTHORS.txt | 2 | ||||
| -rw-r--r-- | thirdparty/etcpak/LICENSE.txt | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt index 60fda8f971..3f4981b7fb 100644 --- a/COPYRIGHT.txt +++ b/COPYRIGHT.txt @@ -179,7 +179,7 @@ License: Expat Files: ./thirdparty/etcpak/ Comment: etcpak -Copyright: 2013-2021, Bartosz Taudul +Copyright: 2013-2022, Bartosz Taudul License: BSD-3-clause Files: ./thirdparty/fonts/DroidSans*.woff2 diff --git a/thirdparty/README.md b/thirdparty/README.md index 93499d1358..ac3ac16401 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -118,7 +118,7 @@ will limit its functionality to IPv4 only. ## etcpak - Upstream: https://github.com/wolfpld/etcpak -- Version: git (f128369e64a5f4715de8125b325e4fe7debb5194, 2022) +- Version: 1.0 (a77d5a37ddf48034cee8aeb9e8792a623c265b4c, 2022) - License: BSD-3-Clause Files extracted from upstream source: diff --git a/thirdparty/etcpak/AUTHORS.txt b/thirdparty/etcpak/AUTHORS.txt index e7bae62c85..675b4eb2a9 100644 --- a/thirdparty/etcpak/AUTHORS.txt +++ b/thirdparty/etcpak/AUTHORS.txt @@ -1,3 +1,5 @@ Bartosz Taudul <wolf@nereid.pl> Daniel Jungmann <el.3d.source@gmail.com> Florian Penzkofer <fp@nullptr.de> +Jae-Ho Nah <nahjaeho@gmail.com> +Marcin Ławicki <marcin.lawicki@gmail.com> diff --git a/thirdparty/etcpak/LICENSE.txt b/thirdparty/etcpak/LICENSE.txt index 59e85d6ea5..9c71039b9b 100644 --- a/thirdparty/etcpak/LICENSE.txt +++ b/thirdparty/etcpak/LICENSE.txt @@ -1,6 +1,6 @@ etcpak, an extremely fast ETC compression utility (https://github.com/wolfpld/etcpak) -Copyright (c) 2013-2021, Bartosz Taudul <wolf@nereid.pl> +Copyright (c) 2013-2022, Bartosz Taudul <wolf@nereid.pl> All rights reserved. Redistribution and use in source and binary forms, with or without |