summaryrefslogtreecommitdiffstats
path: root/LICENSE.txt
diff options
context:
space:
mode:
authorKevin Rushforth <[email protected]>2006-02-23 22:27:23 +0000
committerKevin Rushforth <[email protected]>2006-02-23 22:27:23 +0000
commitf07de17995f3f7c9831453a0fd8c33fd0bf0317f (patch)
tree3a1543f9e8bb022e6e9001eea90aa4558de91876 /LICENSE.txt
parente78968c5346b338acfab133f242042b6f0d3015f (diff)
Updated JDL license for Java 3D API, version 1.4.
git-svn-id: https://svn.java.net/svn/vecmath~svn/trunk@76 dd45e54d-f42e-c781-df72-dca083a658b1
Diffstat (limited to 'LICENSE.txt')
-rw-r--r--LICENSE.txt12
1 files changed, 4 insertions, 8 deletions
diff --git a/LICENSE.txt b/LICENSE.txt
index e2d1c2f..930cc77 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -2,12 +2,8 @@ This software is licensed by Sun:
i) for research use under terms of the Java Research License (JRL) as
specified in the LICENSE-JRL.txt file and on the web at
-"http://java3d.dev.java.net/jrl.html"
+"http://java3d.dev.java.net/jrl.html"; or
-NOTE: The main trunk of the vecmath source code (vecmath
-project) contains proposed API changes for an eventual 1.4 version of
-the Java 3D API. THESE API CHANGES ARE NOT YET APPROVED AS PART OF
-A JAVA SPECIFICATION REQUEST (JSR) UNDER THE JAVA COMMUNITY PROCESS
-(JCP). UNTIL SUCH TIME AS THEY ARE ADOPTED AND APPROVED BY A JSR,
-THE 1.4-EXPERIMENTAL VERSION OF THE JAVA 3D API MAY ONLY BE USED FOR
-RESEARCH UNDER THE TERMS OF THE JAVA RESEARCH LICENSE (JRL).
+ii) for commercial use under the terms of the Java Distribution License
+(JDL) as specified in the LICENSE-JDL.txt file and on the web at
+"http://java3d.dev.java.net/jdl-java3d.pdf".