summaryrefslogtreecommitdiffstats
path: root/index.html
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2014-08-06 09:37:04 +0200
committerSven Gothel <[email protected]>2014-08-06 09:37:04 +0200
commitf314c59bf2c936a1c44d7a470b1d1485ea9ec057 (patch)
tree4956b33c8777baa66ec18acc2f9e5487e8c0000f /index.html
parentd07c0dab6218b71bc1f2172cf06da8d15eeebe79 (diff)
Siggraph2014: Add spash and index page
Diffstat (limited to 'index.html')
-rw-r--r--index.html18
1 files changed, 9 insertions, 9 deletions
diff --git a/index.html b/index.html
index debe74f..040d205 100644
--- a/index.html
+++ b/index.html
@@ -88,15 +88,14 @@
Modules: <a href="gluegen/www">GlueGen</a>, <a href="joal/www">JOAL</a>, <a href="jogl/www">JOGL</a>, <a href="jocl/www">JOCL</a>,
<i><a href="applet-launcher/www">JNLPAppletLauncher</a> (retired)</i>
</p>
- <!---
<div class="splash" style="padding: 0; text-align: left; font-size:21px; line-height:100%; position:relative; top:-21px;" >
- <a href="wiki/index.php/JogAmp_BOF_SIGGRAPH_2013_PLANNING">Meet us @</a>
- <a href="http://s2013.siggraph.org/attendees/birds-feather/events/jogamp-2d3d-multimedia-across-devices">
- <img style="position:relative; top:+25px;" src="doc/siggraph2013/media/siggraph2013-logo_right-transparent-226x55.png" width="226" height="55" alt="JogAmp @ SIGGRAPH 2013"/>
+ <a href="doc/siggraph2014/">Meet us @</a>
+ <a href="doc/siggraph2014/">
+ <img style="position:relative; top:+25px;" src="doc/siggraph2014/media/S14_Logo_R-175x55.png" width="175" height="55" alt="JogAmp @ SIGGRAPH 2014"/>
</a><br/>
<i style="font-size:10px;">.. and get an awesome T-Shirt free!</i>
- </div> -->
-
+ </div>
+
<div class="column">
<h2>Documentation</h2>
<ul>
@@ -125,12 +124,13 @@
<ul>
<li> <a href="jogl/doc/Overview-OpenGL-Evolution-And-JOGL.html">OpenGL Evolution &amp; JOGL</a>
(<a href="jogl/doc/uml/html/fig128069.png">UML</a>)</li>
- <li> FOSDEM - Talk [<a href="doc/fosdem2014/">2014</a>,
- <a href="doc/fosdem2013/">2013</a>]</li>
- <li> SIGGRAPH - BOF [<a href="doc/siggraph2013/">2013</a>,
+ <li> SIGGRAPH - BOF [<a href="doc/siggraph2014/">2014</a>,
+ <a href="doc/siggraph2013/">2013</a>,
<a href="doc/siggraph2012/">2012</a>,
<a href="doc/siggraph2011/jogamp-siggraph2011.pdf">2011</a>,
<a href="doc/siggraph2010/jogamp-siggraph2010.pdf">2010</a>]</li>
+ <li> FOSDEM - Talk [<a href="doc/fosdem2014/">2014</a>,
+ <a href="doc/fosdem2013/">2013</a>]</li>
<li> Res.Ind. <a href="#gpunurbs2011">NURBS @ GPU</a> [<a href="doc/gpunurbs2011/p70-santina.pdf">paper</a>, <a href="doc/gpunurbs2011/graphicon2011-slides.pdf">slides</a>]</li>
<li> For <a href="doc/bibtex/">citations</a> please use this <a href="doc/bibtex/jogamp.bib">BibTex Entry</a></li>
</ul>