aboutsummaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE32
1 files changed, 21 insertions, 11 deletions
diff --git a/LICENSE b/LICENSE
index 6089bcf4a..2ea854b12 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1263,17 +1263,6 @@ understand and accept it fully.
Copyright (C) 2010-2023 by
David Turner, Robert Wilhelm, and Werner Lemberg.
-This file is part of the FreeType project, and may only be used,
-modified, and distributed under the terms of the FreeType project
-license, LICENSE.TXT. By continuing to use, modify, or distribute
-this file you indicate that you have read the license and
-understand and accept it fully.
-
--------------------------------------------------------------------
-
-Copyright (C) 2010-2023 by
-David Turner, Robert Wilhelm, and Werner Lemberg.
-
This file is part of the FreeType project, and may only be used, modified,
and distributed under the terms of the FreeType project license,
LICENSE.TXT. By continuing to use, modify, or distribute this file you
@@ -1716,6 +1705,27 @@ warranty.
-------------------------------------------------------------------
+Copyright (c) 2010, 2017 Craig A. Berry
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+-------------------------------------------------------------------
+
Copyright (c) 2012, Intel Corporation
Copyright (c) 2019 Sony Interactive Entertainment Inc.