summaryrefslogtreecommitdiffstats
path: root/LICENSE.txt
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2010-11-09 11:45:56 +0100
committerSven Gothel <[email protected]>2010-11-09 11:45:56 +0100
commit39b7b17a5d7ec4bb198992e85038ac3e0b3f5b89 (patch)
treecdeca5941a03d1156b9c5d6ca666a6bd19ca7472 /LICENSE.txt
parentf502bd8d176d6fb3282510459b20f2973117721f (diff)
Added proper Khronos license tag (found it)
Diffstat (limited to 'LICENSE.txt')
-rw-r--r--LICENSE.txt29
1 files changed, 22 insertions, 7 deletions
diff --git a/LICENSE.txt b/LICENSE.txt
index 1b3300d21..96a014f46 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -171,13 +171,28 @@ L.5) The JOGL source tree also contains a Java port of Brian Paul's Tile
A.1) The JOGL source tree also contains header files from Khronos,
reflecting OpenKODE, EGL, OpenGL ES1, OpenGL ES2 and OpenGL.
- The Khronos license, actually a 'non license' states:
-
- Using a Khronos API Word or Logo Trademark
- ------------------------------------------
- Any developer or company can freely download the available Khronos API Specifications
- and implement and ship products using the specification completely free of charge, royalty or licensing.
- Use of the related Khronos API Word or Logo Trademark however has certain requirements.
http://www.khronos.org/legal/license/
+ Copyright (c) 2007-2010 The Khronos Group Inc.
+
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and/or associated documentation files (the
+ "Materials"), to deal in the Materials without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Materials, and to
+ permit persons to whom the Materials are 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 Materials.
+
+ THE MATERIALS ARE 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
+ MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+
+