diff options
| author | Kevin Rushforth <[email protected]> | 2004-06-25 21:49:21 +0000 |
|---|---|---|
| committer | Kevin Rushforth <[email protected]> | 2004-06-25 21:49:21 +0000 |
| commit | d2b231525ec5533211c568de7a4fe8fa505625d3 (patch) | |
| tree | 5e3a5a3ccf5e05d5159f8e1f8cd9a7c124b4cd74 /LICENSE.txt | |
| parent | d16e620451954e37d74a069143f3310fc5aa4656 (diff) | |
Added licenses for JRL and JDL
Updated web pages
git-svn-id: https://svn.java.net/svn/vecmath~svn/trunk@9 dd45e54d-f42e-c781-df72-dca083a658b1
Diffstat (limited to 'LICENSE.txt')
| -rw-r--r-- | LICENSE.txt | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/LICENSE.txt b/LICENSE.txt index 4617b0b..930cc77 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,16 +1,9 @@ -===================================================================== -BEGIN LICENSE PLACEHOLDER -===================================================================== +This software is licensed by Sun: -Copyright (c) 2004 Sun Microsystems, Inc. All rights reserved. +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 -This software is licensed under terms that are yet to be disclosed. -Until such time as these terms are disclosed, you may not do anything -at all with the source code in this CVS repository. - -===================================================================== -END LICENSE PLACEHOLDER -===================================================================== - -TODO: remove the above placeholder and put the actual license, and/or -pointer (URL) to license, here. +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". |