diff options
| author | Sven Gothel <[email protected]> | 2010-07-02 02:35:21 +0300 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2010-07-02 02:35:21 +0300 |
| commit | 4bf5b13090d9654921e475415b23fc8428320a0e (patch) | |
| tree | 1c4f11848f360bf5baa4528e4a88191d311b7991 /doc | |
| parent | c9adeced407a9f652594c1334a3ae73eff4fba79 (diff) | |
| parent | fb6bee4cd94e7e6aaf3729b24297f026280b760b (diff) | |
Merge branch 'master' of github.com:mbien/jogl
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/TODO.txt | 5 | ||||
| -rw-r--r-- | doc/deployment/JOGL-DEPLOYMENT.html | 4 | ||||
| -rw-r--r-- | doc/differences-from-gl4java.txt | 1 | ||||
| -rw-r--r-- | doc/userguide/index.html | 9 |
4 files changed, 13 insertions, 6 deletions
diff --git a/doc/TODO.txt b/doc/TODO.txt index 8aa9e96ed..294f16cd1 100644 --- a/doc/TODO.txt +++ b/doc/TODO.txt @@ -1,5 +1,8 @@ +This list is probably completely out of date... +anyone the guts to remove it? :) +-mbien + Random, somewhat old to-do list: -(See Issue Tracker on http://jogl.dev.java.net/ for current high-priority issues) - Non-const array types must be properly released with JNI_COMMIT in order to see side effects if the array was copied. diff --git a/doc/deployment/JOGL-DEPLOYMENT.html b/doc/deployment/JOGL-DEPLOYMENT.html index da5becb91..b54bc6406 100644 --- a/doc/deployment/JOGL-DEPLOYMENT.html +++ b/doc/deployment/JOGL-DEPLOYMENT.html @@ -21,8 +21,8 @@ <li><a href="../../../demos/www/">Demos</a></li> <li><a href="../../../wiki/">Wiki</a></li> <li><a href="../../../deployment/jogl-next/javadoc_public/">JavaDoc</a></li> - <li><a href="../../blog/">Blogs</a></li> - <li><a href="../../forum.html">Forums</a></li> + <li><a href="../../../blog/">Blogs</a></li> + <li><a href="../../../forum.html">Forums</a></li> </ul> </div> <div id="main"> diff --git a/doc/differences-from-gl4java.txt b/doc/differences-from-gl4java.txt index 9114c89cf..30c6c090b 100644 --- a/doc/differences-from-gl4java.txt +++ b/doc/differences-from-gl4java.txt @@ -1,3 +1,4 @@ +JOGL 1.x: - GLContext is no longer exposed in the public API. - No more GLAnimCanvas/GLAnimJPanel variants. To perform animation, attach an Animator to a GLDrawable. diff --git a/doc/userguide/index.html b/doc/userguide/index.html index 3d693eb95..aa0645bf9 100644 --- a/doc/userguide/index.html +++ b/doc/userguide/index.html @@ -23,9 +23,11 @@ <li><a href="../../../deployment/jogl-next/javadoc_public/">JavaDoc</a></li> </ul> </div> - <div id="main" class="fill"> - - + <div id="main"> + <div id="text" class="fill"> + <h2><font color="red">WARNING: This document has not been updated for a long time.</font></h2> + <br/> + <br/> <UL> <LI> Overview @@ -999,6 +1001,7 @@ href="http://javagaming.org/forums/index.php?topic=4217.0">"JOGL 1.1 released"</a>. + </div> </div> <div id="footer"> <div id="footer_left"> |