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 /www/media | |
| 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 'www/media')
30 files changed, 0 insertions, 0 deletions
diff --git a/www/media/Impact_Bullet_AKM.in-1.png b/www/media/Impact_Bullet_AKM.in-1.png Binary files differnew file mode 100644 index 000000000..fb47ac49b --- /dev/null +++ b/www/media/Impact_Bullet_AKM.in-1.png diff --git a/www/media/JaamSim_160x160.png b/www/media/JaamSim_160x160.png Binary files differnew file mode 100644 index 000000000..f6da6a589 --- /dev/null +++ b/www/media/JaamSim_160x160.png diff --git a/www/media/Java3d.png b/www/media/Java3d.png Binary files differnew file mode 100644 index 000000000..ea7ea1bcd --- /dev/null +++ b/www/media/Java3d.png diff --git a/www/media/MyHmi-Collage-160x152.png b/www/media/MyHmi-Collage-160x152.png Binary files differnew file mode 100644 index 000000000..8f14af7b3 --- /dev/null +++ b/www/media/MyHmi-Collage-160x152.png diff --git a/www/media/VolumeViewer-160x120.png b/www/media/VolumeViewer-160x120.png Binary files differnew file mode 100644 index 000000000..2bb36d83c --- /dev/null +++ b/www/media/VolumeViewer-160x120.png diff --git a/www/media/ardor3d.png b/www/media/ardor3d.png Binary files differnew file mode 100644 index 000000000..9be447465 --- /dev/null +++ b/www/media/ardor3d.png diff --git a/www/media/c3d-mobile-01-coll01-160x160.png b/www/media/c3d-mobile-01-coll01-160x160.png Binary files differnew file mode 100644 index 000000000..1b11b8056 --- /dev/null +++ b/www/media/c3d-mobile-01-coll01-160x160.png diff --git a/www/media/c3d-mobile-01-pipes01-160x125.png b/www/media/c3d-mobile-01-pipes01-160x125.png Binary files differnew file mode 100644 index 000000000..e7434ad64 --- /dev/null +++ b/www/media/c3d-mobile-01-pipes01-160x125.png diff --git a/www/media/c3d-mobile-01-pipes07-160x120.png b/www/media/c3d-mobile-01-pipes07-160x120.png Binary files differnew file mode 100644 index 000000000..20a30d706 --- /dev/null +++ b/www/media/c3d-mobile-01-pipes07-160x120.png diff --git a/www/media/c3d-studio-snap2-160x160.png b/www/media/c3d-studio-snap2-160x160.png Binary files differnew file mode 100644 index 000000000..c379017a3 --- /dev/null +++ b/www/media/c3d-studio-snap2-160x160.png diff --git a/www/media/c3d-studio.jpg b/www/media/c3d-studio.jpg Binary files differdeleted file mode 100644 index a3be18866..000000000 --- a/www/media/c3d-studio.jpg +++ /dev/null diff --git a/www/media/dyn4j.png b/www/media/dyn4j.png Binary files differnew file mode 100644 index 000000000..3fd7bf65c --- /dev/null +++ b/www/media/dyn4j.png diff --git a/www/media/fenggui.jpg b/www/media/fenggui.jpg Binary files differindex c55a8c1c6..0bddf0eb3 100644 --- a/www/media/fenggui.jpg +++ b/www/media/fenggui.jpg diff --git a/www/media/fusion-laboratory.jpg b/www/media/fusion-laboratory.jpg Binary files differdeleted file mode 100644 index 15b077f6c..000000000 --- a/www/media/fusion-laboratory.jpg +++ /dev/null diff --git a/www/media/fusion_logo.jpg b/www/media/fusion_logo.jpg Binary files differnew file mode 100644 index 000000000..613ddaa54 --- /dev/null +++ b/www/media/fusion_logo.jpg diff --git a/www/media/gephi.jpg b/www/media/gephi.jpg Binary files differindex adbf75746..fea90a76c 100644 --- a/www/media/gephi.jpg +++ b/www/media/gephi.jpg diff --git a/www/media/insparia-160x132.jpg b/www/media/insparia-160x132.jpg Binary files differnew file mode 100644 index 000000000..5bb8bfc50 --- /dev/null +++ b/www/media/insparia-160x132.jpg diff --git a/www/media/insparia.jpg b/www/media/insparia.jpg Binary files differdeleted file mode 100644 index 868e11204..000000000 --- a/www/media/insparia.jpg +++ /dev/null diff --git a/www/media/j4k-demo-160x118.png b/www/media/j4k-demo-160x118.png Binary files differnew file mode 100644 index 000000000..869d4df0c --- /dev/null +++ b/www/media/j4k-demo-160x118.png diff --git a/www/media/jake2-160x160.png b/www/media/jake2-160x160.png Binary files differnew file mode 100644 index 000000000..072145809 --- /dev/null +++ b/www/media/jake2-160x160.png diff --git a/www/media/jake2.jpg b/www/media/jake2.jpg Binary files differdeleted file mode 100644 index dd7bf96f7..000000000 --- a/www/media/jake2.jpg +++ /dev/null diff --git a/www/media/jmonkeyengine.png b/www/media/jmonkeyengine.png Binary files differnew file mode 100644 index 000000000..a3e2a2a1f --- /dev/null +++ b/www/media/jmonkeyengine.png diff --git a/www/media/jspatial-1-160x160.png b/www/media/jspatial-1-160x160.png Binary files differnew file mode 100644 index 000000000..95b546c00 --- /dev/null +++ b/www/media/jspatial-1-160x160.png diff --git a/www/media/jzy3d-demo-surface-160x160.png b/www/media/jzy3d-demo-surface-160x160.png Binary files differnew file mode 100644 index 000000000..7be34e35c --- /dev/null +++ b/www/media/jzy3d-demo-surface-160x160.png diff --git a/www/media/libgdx.png b/www/media/libgdx.png Binary files differnew file mode 100644 index 000000000..f801e0b49 --- /dev/null +++ b/www/media/libgdx.png diff --git a/www/media/nifty-logo-new.png b/www/media/nifty-logo-new.png Binary files differnew file mode 100644 index 000000000..c8390ceac --- /dev/null +++ b/www/media/nifty-logo-new.png diff --git a/www/media/sculpteo_3_robot_72dpi_sm.jpg b/www/media/sculpteo_3_robot_72dpi_sm.jpg Binary files differindex 6a1d6ce04..02f3d5e93 100644 --- a/www/media/sculpteo_3_robot_72dpi_sm.jpg +++ b/www/media/sculpteo_3_robot_72dpi_sm.jpg diff --git a/www/media/ticket2ride_picture5-160x132.jpg b/www/media/ticket2ride_picture5-160x132.jpg Binary files differnew file mode 100644 index 000000000..2ab252fb4 --- /dev/null +++ b/www/media/ticket2ride_picture5-160x132.jpg diff --git a/www/media/unlicense-preview.png b/www/media/unlicense-preview.png Binary files differnew file mode 100644 index 000000000..d7e42df5d --- /dev/null +++ b/www/media/unlicense-preview.png diff --git a/www/media/vehicle.jpg b/www/media/vehicle.jpg Binary files differindex c90f4cc27..b1369c96f 100644 --- a/www/media/vehicle.jpg +++ b/www/media/vehicle.jpg |
