diff options
| author | Kevin Rushforth <[email protected]> | 2006-09-29 18:04:13 +0000 |
|---|---|---|
| committer | Kevin Rushforth <[email protected]> | 2006-09-29 18:04:13 +0000 |
| commit | 908d0fbb2ea26226165cd42f12abf0d27e4a3f53 (patch) | |
| tree | 0258d2293efab8f4eafba39a528a3d2eedd0c3cb /LICENSE.txt | |
| parent | 0661a22dd9278b20856b13b08ff22d248119cf6b (diff) | |
Merged dev-1_5 branch back to MAIN trunk
git-svn-id: https://svn.java.net/svn/j3d-core~svn/trunk@701 ba19aa83-45c5-6ac9-afd3-db810772062c
Diffstat (limited to 'LICENSE.txt')
| -rw-r--r-- | LICENSE.txt | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/LICENSE.txt b/LICENSE.txt index 930cc77..8b293be 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -2,8 +2,12 @@ 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"; or +"http://java3d.dev.java.net/jrl.html" -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". +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). |