summaryrefslogtreecommitdiffstats
path: root/LICENSE.txt
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2014-06-20 08:20:12 +0200
committerSven Gothel <[email protected]>2014-06-20 08:20:12 +0200
commitae17eca383cce89a000062c3a86e415a6753066b (patch)
tree5a199349e4174c4700ca11825f45c24e962f7953 /LICENSE.txt
parentd7d8d11abad1e4e17532068333dfe9dddf2942a2 (diff)
Bug 1021: Add note about 'Oculus VR Rift SDK Software License' in LICENSE.txt
Diffstat (limited to 'LICENSE.txt')
-rw-r--r--LICENSE.txt16
1 files changed, 16 insertions, 0 deletions
diff --git a/LICENSE.txt b/LICENSE.txt
index e8c5a52d1..57a1fa3ac 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -363,3 +363,19 @@ A.6) The JOGL source tree contains code from Hernan J. Gonzalez and Shawn Hartso
src/jogl/classes/jogamp/opengl/util/pngj/**
+A.7) The JOGL source tree _may_ contain code Oculus VR, Inc.
+ which is covered by it's own permissive Oculus VR Rift SDK Software License.
+
+ This code can be included to produce a binding
+ and hence feature support to the Oculus VR Rift.
+
+ The code is included and it's build artifacts will be released,
+ if the git sub-module oculusvr-sdk is included in the jogl source repo.
+
+ Copyright © 2014 Oculus VR, Inc. All rights reserved.
+
+ Oculus VR Rift SDK Software License
+ http://www.oculusvr.com/licenses/LICENSE-3.1
+ http://jogamp.org/git/?p=oculusvr-sdk.git;a=blob;f=LICENSE.txt;hb=HEAD
+ Or within this repository: oculusvr-sdk/LICENSE.txt
+