diff options
author | gfxadmin <[email protected]> | 2006-07-21 22:45:09 +0000 |
---|---|---|
committer | gfxadmin <[email protected]> | 2006-07-21 22:45:09 +0000 |
commit | ddddf3b04572f6ebd2fd5dc8e0a34b0186ce3e72 (patch) | |
tree | 4d2dd42da0d9b910459c7efc5638158480a5c9c8 /LICENSE.txt | |
parent | e552d800ee9df3761108c044342612c8bda1f304 (diff) |
Issue number:
Obtained from:
Submitted by: Travis
Reviewed by:
Sun is adding an alternative license term to the SGI Free B license which
is permitted under that license. We are removing a couple of provisions
from the SGI Free B license to make the license more liberal for our end
users of JOGL. So these changes are just communication of that. There are
no actual source code changes, just changes to the license file and the
license text in each source code file.
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@856 232f8b59-042b-4e1e-8c03-345bb8c30851
Diffstat (limited to 'LICENSE.txt')
-rwxr-xr-x | LICENSE.txt | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/LICENSE.txt b/LICENSE.txt index f1238959c..c630b270d 100755 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -36,7 +36,9 @@ JOGL is released under the BSD license. The full license terms follow: The JOGL source tree contains code ported from the OpenGL sample implementation by Silicon Graphics, Inc. This code is licensed under -the SGI Free Software License B: +the SGI Free Software License B (Sun is redistributing the modified code +under a slightly modified, alternative license, which is described two +paragraphs below after "NOTE:"): License Applicability. Except to the extent portions of this file are made subject to an alternative license as permitted in the SGI Free @@ -53,6 +55,16 @@ the SGI Free Software License B: DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. + + NOTE: The Original Code (as defined below) has been licensed to Sun + Microsystems, Inc. ("Sun") under the SGI Free Software License B + (Version 1.1), shown above ("SGI License"). Pursuant to Section + 3.2(3) of the SGI License, Sun is distributing the Covered Code to + you under an alternative license ("Alternative License"). This + Alternative License includes all of the provisions of the SGI License + except that Section 2.2 and 11 are omitted. Any differences between + the Alternative License and the SGI License are offered solely by Sun + and not by SGI. Original Code. The Original Code is: OpenGL Sample Implementation, Version 1.2.1, released January 26, 2000, developed by Silicon Graphics, @@ -70,6 +82,7 @@ the SGI Free Software License B: published by SGI, but has not been independently verified as being compliant with the OpenGL(R) version 1.2.1 Specification. + The JOGL source tree contains code from the LWJGL project which is similarly covered by the BSD license: |