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 /LICENSE.txt | |
| 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 'LICENSE.txt')
| -rw-r--r-- | LICENSE.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/LICENSE.txt b/LICENSE.txt index 3550ab282..6da9f545e 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -45,7 +45,9 @@ L.1) The JOGL source tree contains code from the JogAmp Community You can address the JogAmp Community via: Web http://jogamp.org/ Forum/Mailinglist http://forum.jogamp.org - JogAmp Channel server: conference.jabber.org room: jogamp + Chatrooms + IRC irc.freenode.net #jogamp + Jabber conference.jabber.org room: jogamp (deprecated!) Repository http://jogamp.org/git/ Email mediastream _at_ jogamp _dot_ org @@ -344,7 +346,7 @@ A.6) The JOGL source tree contains code from Hernan J. Gonzalez and Shawn Hartso PNGJ: Java library for reading and writing PNG images. - Version 0.85 (1 April 2012) + Version 1.12 (3 Dec 2012) <http://code.google.com/p/pngj/> |