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/resources/assets | |
| 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/resources/assets')
| -rw-r--r-- | make/resources/assets/jogl/util/data/av/test-ntsc01-160x90.png | bin | 2785 -> 0 bytes |
| -rw-r--r-- | make/resources/assets/jogl/util/data/av/test-ntsc01-57x32.png | bin | 0 -> 969 bytes |
| -rw-r--r-- | make/resources/assets/newt/data/cross-grey-alpha-16x16.png | bin | 0 -> 286 bytes |
| -rw-r--r-- | make/resources/assets/newt/data/jogamp-16x16.png | bin | 0 -> 549 bytes |
| -rw-r--r-- | make/resources/assets/newt/data/jogamp-32x32.png | bin | 0 -> 1020 bytes |
| -rw-r--r-- | make/resources/assets/newt/data/pointer-grey-alpha-16x24.png | bin | 0 -> 511 bytes |
6 files changed, 0 insertions, 0 deletions
diff --git a/make/resources/assets/jogl/util/data/av/test-ntsc01-160x90.png b/make/resources/assets/jogl/util/data/av/test-ntsc01-160x90.png Binary files differdeleted file mode 100644 index 3df47432e..000000000 --- a/make/resources/assets/jogl/util/data/av/test-ntsc01-160x90.png +++ /dev/null diff --git a/make/resources/assets/jogl/util/data/av/test-ntsc01-57x32.png b/make/resources/assets/jogl/util/data/av/test-ntsc01-57x32.png Binary files differnew file mode 100644 index 000000000..0a1488c6b --- /dev/null +++ b/make/resources/assets/jogl/util/data/av/test-ntsc01-57x32.png diff --git a/make/resources/assets/newt/data/cross-grey-alpha-16x16.png b/make/resources/assets/newt/data/cross-grey-alpha-16x16.png Binary files differnew file mode 100644 index 000000000..303c454fa --- /dev/null +++ b/make/resources/assets/newt/data/cross-grey-alpha-16x16.png diff --git a/make/resources/assets/newt/data/jogamp-16x16.png b/make/resources/assets/newt/data/jogamp-16x16.png Binary files differnew file mode 100644 index 000000000..02df8997f --- /dev/null +++ b/make/resources/assets/newt/data/jogamp-16x16.png diff --git a/make/resources/assets/newt/data/jogamp-32x32.png b/make/resources/assets/newt/data/jogamp-32x32.png Binary files differnew file mode 100644 index 000000000..ab21c6e1b --- /dev/null +++ b/make/resources/assets/newt/data/jogamp-32x32.png diff --git a/make/resources/assets/newt/data/pointer-grey-alpha-16x24.png b/make/resources/assets/newt/data/pointer-grey-alpha-16x24.png Binary files differnew file mode 100644 index 000000000..98b2c8640 --- /dev/null +++ b/make/resources/assets/newt/data/pointer-grey-alpha-16x24.png |
