diff options
| author | Sven Gothel <[email protected]> | 2014-07-05 15:13:19 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2014-07-05 15:13:19 +0200 |
| commit | 06fc570f70dc5ccfad7399d8426bdf224c239a5a (patch) | |
| tree | f844f7c9bcd564a8d945e5e7f1f085409f91d3b1 /doc | |
| parent | bda482e4eee76a5ba2139645682ae64dadacbc6b (diff) | |
| parent | 5951b33b303df3a12888fe0fbc5ccc88112a3984 (diff) | |
Merge remote-tracking branch 'github-mark/master' (Bug 1023/Bug 1024)
Conflicts:
make/scripts/tests.sh
(build.xml: Using <copy tofile=".."/> instead of producing new jar files via <jar> to keep identity)
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/deployment/JOGL-DEPLOYMENT.html | 6 | ||||
| -rw-r--r-- | doc/wiki/FAQ.xml | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/deployment/JOGL-DEPLOYMENT.html b/doc/deployment/JOGL-DEPLOYMENT.html index 81a028e87..1c504a1e4 100644 --- a/doc/deployment/JOGL-DEPLOYMENT.html +++ b/doc/deployment/JOGL-DEPLOYMENT.html @@ -227,13 +227,13 @@ <ul> <li>Mandatory:<br/> <ul> - <li>nativewindow-core.jar</li> - <li>jogl-core.jar</li> + <li>nativewindow.jar</li> + <li>jogl.jar</li> </ul></li> <li>Newt (optional):<br/> <ul> - <li>newt-core.jar</li> + <li>newt.jar</li> <li>newt-ogl.jar (to use NEWT with JOGL)</li> </ul></li> </ul> diff --git a/doc/wiki/FAQ.xml b/doc/wiki/FAQ.xml index d01413d50..5539ff01f 100644 --- a/doc/wiki/FAQ.xml +++ b/doc/wiki/FAQ.xml @@ -224,7 +224,7 @@ Note: A bug on MacOSX is known, launching 2 JOGL applets in 2 tabs. <param name="progressbar" value="true"> <param name="jnlpNumExtensions" value="1"> <param name="jnlpExtension1" - value="http://download.java.net/media/jogl/jsr-231-2.x-webstart/jogl-core.jnlp"> + value="http://download.java.net/media/jogl/jsr-231-2.x-webstart/jogl.jnlp"> <param name="java_arguments" value="-Dsun.java2d.noddraw=true"> <param name="jnlp_href" value="applet-gears.jnlp"> </applet> |