summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2011-09-21 11:01:45 +0200
committerSven Gothel <[email protected]>2011-09-21 11:01:45 +0200
commit8fdce3781f574c990f24725f5325d9cbe076e448 (patch)
treeec6be719616eaa35c30d72bec6180a6a36714518
parentc08480b50cbd227285fb06aed5a3c59208e3b24c (diff)
LICENSE.txt: Removed 'may be used'. Added Emphasized multiple licenses
-rw-r--r--LICENSE.txt12
1 files changed, 5 insertions, 7 deletions
diff --git a/LICENSE.txt b/LICENSE.txt
index d1154f59e..a020ffe8f 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,14 +1,12 @@
-JOGL as a whole may be used under the terms of the New BSD 3-clause license,
-which is the common denominator of the following used 5 BSD licenses L.1 - L.5.
+The JOGL source code is mostly licensed under the New BSD 2-clause license,
+however it contains other licensed material as well.
-+++
-
-Additional licenses compatible with the BSD 3-clause license are listed below A.1 - A...
+Below you find a detailed list of licenses used in this project.
+++
-Exception is the content of folder 'make/lib'.
-This folder contains build/test time only Java binaries (JAR) to ease the build setup.
+The content of folder 'make/lib' contains build- and test-time only
+Java binaries (JAR) to ease the build setup.
Each JAR file has it's corresponding LICENSE file containing the
source location and license text. None of these binaries are contained in any way
by the generated and deployed JOGL binaries.