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 /make/versions.xml | |
| 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 'make/versions.xml')
| -rw-r--r-- | make/versions.xml | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/make/versions.xml b/make/versions.xml deleted file mode 100644 index f5d17ba66..000000000 --- a/make/versions.xml +++ /dev/null @@ -1,47 +0,0 @@ -<!-- This file is the one canonical location containing the version - numbers for the various components such as JOGL and Newt. --> - -<project name="versions"> - - <!-- This is the base version of JOGL. For official release builds, - and nightly builds, this should be in the form "x.y{.z}", for - example, "2.0" or "2.1.1". Nightly builds will have a "-pre-" - and a timestamp automatically added to this version number. For - intermediate release builds, this should be in the form, for - example, "2.0-beta1" or "2.0-rc1". For large releases, push - betas before release candidates to give the Community time to - react.--> - <property name="jogl_base_version" value="2.0" /> - <property name="jogl_int_version" value="0914010" /> <!-- xxyyzzz, xx=API yy screen-from-to zzz app-version--> - - <!-- Uncomment this property in order to produce a JOGL release - build without running the "RI" (Reference Implementation) - target in build-jogl.xml. This should be uncommented for - official release builds and intermediate release builds, but - commented out for nightly builds. --> - <!-- <property name="jogl.ri" value="true" /> --> - - <!-- Base version of the NativeWindow interface, following the same - rules as above --> - <property name="nativewindow_base_version" value="2.0" /> - - <!-- Uncomment this property in order to produce a NativeWindow - build without running the "RI" (Reference Implementation) - target in build-nativewindow.xml. This should be uncommented for - official release builds and intermediate release builds, but - commented out for nightly builds. --> - <!-- <property name="nativewindow.ri" value="true" /> --> - - <!-- Base version of the Newt library, following the same - rules as above --> - <property name="newt_base_version" value="2.0" /> - - <!-- Newt isn't covered by a JSR at the moment, so there is little - value in having a different reference implementation - vs. intermediate build numbering scheme, but for the moment - let's keep things symmetric. This should be uncommented for - official release builds and intermediate release builds, but - commented out for nightly builds. --> - <!-- <property name="newt.ri" value="true" /> --> - -</project> |