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

1 files changed, 18 insertions, 18 deletions

diff --git a/jnlp-files/atomic/newt-awt-jogl.jnlp b/jnlp-files/atomic/newt-awt-jogl.jnlp
index 69406e43c..0a43128bb 100644
--- a/jnlp-files/atomic/newt-awt-jogl.jnlp
+++ b/jnlp-files/atomic/newt-awt-jogl.jnlp
@@ -14,50 +14,50 @@
       <all-permissions/>
   </security>
     <resources>
-      <jar href="jar/atomic/newt.core.jar" />
-      <jar href="jar/atomic/newt.ogl.jar" />
-      <jar href="jar/atomic/newt.awt.jar" />
+      <jar href="jar/atomic/newt-core.jar" />
+      <jar href="jar/atomic/newt-ogl.jar" />
+      <jar href="jar/atomic/newt-awt.jar" />
       <extension name="jogl-awt" href="JOGL_CODEBASE_TAG/jogl-awt.jnlp" />
     </resources>
 
     <resources os="Windows" arch="x86">
-      <jar href="jar/atomic/newt.driver.win.jar" />
+      <jar href="jar/atomic/newt-driver-win.jar" />
       <nativelib href = "jar/atomic/newt-natives-windows-i586.jar" />
     </resources>
     <resources os="Windows" arch="amd64">
-      <jar href="jar/atomic/newt.driver.win.jar" />
+      <jar href="jar/atomic/newt-driver-win.jar" />
       <nativelib href = "jar/atomic/newt-natives-windows-amd64.jar" />
     </resources>
     <resources os="Windows" arch="x86_64">
-      <jar href="jar/atomic/newt.driver.win.jar" />
+      <jar href="jar/atomic/newt-driver-win.jar" />
       <nativelib href = "jar/atomic/newt-natives-windows-amd64.jar" />
     </resources>
     <resources os="SunOS" arch="sparc">
-      <jar href="jar/atomic/newt.driver.x11.jar" />
+      <jar href="jar/atomic/newt-driver-x11.jar" />
       <nativelib href = "jar/atomic/newt-natives-solaris-sparc.jar" />
     </resources>
     <resources os="SunOS" arch="sparcv9">
-      <jar href="jar/atomic/newt.driver.x11.jar" />
+      <jar href="jar/atomic/newt-driver-x11.jar" />
       <nativelib href = "jar/atomic/newt-natives-solaris-sparcv9.jar" />
     </resources>
     <resources os="SunOS" arch="x86">
-      <jar href="jar/atomic/newt.driver.x11.jar" />
+      <jar href="jar/atomic/newt-driver-x11.jar" />
       <nativelib href = "jar/atomic/newt-natives-solaris-i586.jar" />
     </resources>
     <resources os="SunOS" arch="amd64">
-      <jar href="jar/atomic/newt.driver.x11.jar" />
+      <jar href="jar/atomic/newt-driver-x11.jar" />
       <nativelib href = "jar/atomic/newt-natives-solaris-amd64.jar" />
     </resources>
     <resources os="SunOS" arch="x86_64">
-      <jar href="jar/atomic/newt.driver.x11.jar" />
+      <jar href="jar/atomic/newt-driver-x11.jar" />
       <nativelib href = "jar/atomic/newt-natives-solaris-amd64.jar" />
     </resources>
     <resources os="Linux" arch="i386">
-      <jar href="jar/atomic/newt.driver.x11.jar" />
+      <jar href="jar/atomic/newt-driver-x11.jar" />
       <nativelib href = "jar/atomic/newt-natives-linux-i586.jar" />
     </resources>
     <resources os="Linux" arch="x86">
-      <jar href="jar/atomic/newt.driver.x11.jar" />
+      <jar href="jar/atomic/newt-driver-x11.jar" />
       <nativelib href = "jar/atomic/newt-natives-linux-i586.jar" />
     </resources>
     <resources os="Linux" arch="amd64">
@@ -65,23 +65,23 @@
       <nativelib href = "jar/atomic/newt-natives-linux-amd64.jar" />
     </resources>
     <resources os="Linux" arch="x86_64">
-      <jar href="jar/atomic/newt.driver.x11.jar" />
+      <jar href="jar/atomic/newt-driver-x11.jar" />
       <nativelib href = "jar/atomic/newt-natives-linux-amd64.jar" />
     </resources>
     <resources os="Linux" arch="arm">
-      <jar href="jar/atomic/newt.driver.x11.jar" />
+      <jar href="jar/atomic/newt-driver-x11.jar" />
       <nativelib href = "jar/atomic/newt-natives-linux-armv7.jar" />
     </resources>
     <resources os="Linux" arch="armv7">
-      <jar href="jar/atomic/newt.driver.x11.jar" />
+      <jar href="jar/atomic/newt-driver-x11.jar" />
       <nativelib href = "jar/atomic/newt-natives-linux-armv7.jar" />
     </resources>
     <resources os="Mac OS X" arch="i386">
-      <jar href="jar/atomic/newt.driver.osx.jar" />
+      <jar href="jar/atomic/newt-driver-osx.jar" />
       <nativelib href = "jar/atomic/newt-natives-macosx-universal.jar" />
     </resources>
     <resources os="Mac OS X" arch="x86_64">
-      <jar href="jar/atomic/newt.driver.osx.jar" />
+      <jar href="jar/atomic/newt-driver-osx.jar" />
       <nativelib href = "jar/atomic/newt-natives-macosx-universal.jar" />
     </resources>