diff options
| author | Sven Gothel <[email protected]> | 2014-02-23 14:51:06 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2014-02-23 14:51:06 +0100 |
| commit | 3352601e0860584509adf2b76f993d03893ded4b (patch) | |
| tree | 974fccc8c0eb2f5ad9d4ffd741dfc35869ed67b5 /jnlp-files/jogl-all-noawt.jnlp | |
| parent | f51933f0ebe9ae030c26c066e59a728ce08b8559 (diff) | |
| parent | c67de337a8aaf52e36104c3f13e273aa19d21f1f (diff) | |
Merge branch 'master' into stash_glyphcache
Conflicts:
make/scripts/tests.sh
src/jogl/classes/com/jogamp/graph/curve/OutlineShape.java
src/jogl/classes/com/jogamp/graph/curve/Region.java
src/jogl/classes/com/jogamp/graph/curve/opengl/GLRegion.java
src/jogl/classes/com/jogamp/graph/curve/opengl/RegionRenderer.java
src/jogl/classes/com/jogamp/graph/curve/opengl/Renderer.java
src/jogl/classes/com/jogamp/graph/curve/opengl/TextRenderer.java
src/jogl/classes/com/jogamp/graph/font/Font.java
src/jogl/classes/com/jogamp/opengl/math/VectorUtil.java
src/jogl/classes/jogamp/graph/curve/text/GlyphShape.java
src/jogl/classes/jogamp/graph/curve/text/GlyphString.java
src/jogl/classes/jogamp/graph/font/typecast/TypecastFont.java
src/jogl/classes/jogamp/graph/font/typecast/TypecastGlyph.java
src/jogl/classes/jogamp/graph/font/typecast/TypecastRenderer.java
Diffstat (limited to 'jnlp-files/jogl-all-noawt.jnlp')
| -rw-r--r-- | jnlp-files/jogl-all-noawt.jnlp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/jnlp-files/jogl-all-noawt.jnlp b/jnlp-files/jogl-all-noawt.jnlp index 63f558d38..802b9b929 100644 --- a/jnlp-files/jogl-all-noawt.jnlp +++ b/jnlp-files/jogl-all-noawt.jnlp @@ -14,7 +14,7 @@ <all-permissions/> </security> <resources> - <jar href="jar/jogl.all-noawt.jar" /> + <jar href="jar/jogl-all-noawt.jar" /> <extension name="gluegen-rt" href="GLUEGEN_CODEBASE_TAG/gluegen-rt.jnlp" /> </resources> @@ -56,10 +56,12 @@ <nativelib href = "jar/jogl-all-natives-linux-amd64.jar" /> </resources> <resources os="Linux" arch="arm"> - <nativelib href = "jar/jogl-all-natives-linux-armv7.jar" /> + <nativelib href = "jar/jogl-all-natives-linux-armv6.jar" /> + <nativelib href = "jar/jogl-all-natives-linux-armv6hf.jar" /> </resources> <resources os="Linux" arch="armv7"> - <nativelib href = "jar/jogl-all-natives-linux-armv7.jar" /> + <nativelib href = "jar/jogl-all-natives-linux-armv6.jar" /> + <nativelib href = "jar/jogl-all-natives-linux-armv6hf.jar" /> </resources> <resources os="Mac OS X" arch="i386"> <nativelib href = "jar/jogl-all-natives-macosx-universal.jar" /> |