diff options
| author | Kevin Rushforth <[email protected]> | 2006-12-14 18:10:48 +0000 |
|---|---|---|
| committer | Kevin Rushforth <[email protected]> | 2006-12-14 18:10:48 +0000 |
| commit | 9ed6986deff43d7da515aa54df71eda2f044c480 (patch) | |
| tree | 4bdf3fbebc544d95e10a0a1df6caac239ec9a208 /LICENSE.txt | |
| parent | 55000b8e4e6a91116b9d7784ca91c12064263748 (diff) | |
Update main LICENSE.txt file for 1.5
git-svn-id: https://svn.java.net/svn/j3d-core~svn/trunk@761 ba19aa83-45c5-6ac9-afd3-db810772062c
Diffstat (limited to 'LICENSE.txt')
| -rw-r--r-- | LICENSE.txt | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/LICENSE.txt b/LICENSE.txt index 8b293be..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 Java 3D core source code (j3d-core -project) contains proposed API changes for an eventual 1.5 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.5-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". |