summaryrefslogtreecommitdiff
path: root/COPYRIGHT.txt
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2019-04-19 12:03:12 +0200
committerRémi Verschelde <rverschelde@gmail.com>2019-04-19 12:39:26 +0200
commit1e39fee1408055001e8500917f95581c4ac7b28f (patch)
treea8556791f2babf5799e1915ead0b5456aae5e0c8 /COPYRIGHT.txt
parent1b3ea697c5dcbbb2feb0f96204de257532edaf0c (diff)
xatlas: Revert to unmodified upstream code, add to COPYRIGHT
Imported by @reduz from https://github.com/jpcy/xatlas/commit/b8ec29b6b62fb808823e042df5f0f800c07f2e8b Custom changes will be remade properly in the next commit.
Diffstat (limited to 'COPYRIGHT.txt')
-rw-r--r--COPYRIGHT.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt
index 738a0e62b5..edfbbb6d89 100644
--- a/COPYRIGHT.txt
+++ b/COPYRIGHT.txt
@@ -391,6 +391,13 @@ Copyright: 2011, Khaled Mamou
2003-2009, Erwin Coumans
License: BSD-3-clause
+Files: ./thirdparty/xatlas/
+Comment: xatlas
+Copyright: 2018, Jonathan Young
+ 2013, Thekla, Inc
+ 2006, NVIDIA Corporation, Ignacio Castano
+License: Expat
+
Files: ./thirdparty/zlib/
Comment: zlib
Copyright: 1995-2017, Jean-loup Gailly and Mark Adler