diff options
| author | Sven Gothel <[email protected]> | 2011-09-16 14:38:04 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2011-09-16 14:38:04 +0200 |
| commit | 35f8a7539b265510e56b88a60c1e86a9b9a17b10 (patch) | |
| tree | 747d3c13076bebf11686fa836ad00c9248e8381e | |
| parent | d1d44c2ffada89aec0f83ee0fb740dbb1b1903f2 (diff) | |
| parent | 1175f6cd26b632a259060d4d953fdf3c7c6bc076 (diff) | |
Merge branch 'master' of ssh://jogamp.org/srv/scm/jogamp.org
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | planet2/config/planet-config.xml | 6 | ||||
| -rw-r--r-- | planet2/config/planet-template.html | 22 |
3 files changed, 22 insertions, 7 deletions
@@ -6,7 +6,6 @@ deployment wiki stream icons -doc demos chuck HungryHarry diff --git a/planet2/config/planet-config.xml b/planet2/config/planet-config.xml index d346caa..de10d2c 100644 --- a/planet2/config/planet-config.xml +++ b/planet2/config/planet-config.xml @@ -13,12 +13,12 @@ <output>/srv/www/jogamp.org/planet</output> </planet> - <feed name="dominik-blog" url="http://copypastaresearch.tumblr.com/rss"/> - <feed name="mbien-blog1" url="http://michael-bien.com/mbien/feed/entries/atom?tags=jogl"/> - <feed name="mbien-blog2" url="http://michael-bien.com/mbien/feed/entries/atom?tags=jocl"/> <feed name="jau-blog" url="http://jausoft.com/blog/category/computer-stuff/3d-opengl/jogl/feed/"/> <feed name="rami-blog" url="http://ramisantina.com/blog/?feed=rss2&tag=jogl"/> + <feed name="dominik-blog" url="http://copypastaresearch.tumblr.com/rss"/> <feed name="wade-blog" url="http://en.wordpress.com/tag/java-opengl/feed/"/> + <feed name="mbien-blog1" url="http://michael-bien.com/mbien/feed/entries/atom?tags=jogl"/> + <feed name="mbien-blog2" url="http://michael-bien.com/mbien/feed/entries/atom?tags=jocl"/> <feed name="william-dyn4j-news" url="http://www.dyn4j.org/feed"/> <feed name="william-blog-gl-tag" url="http://www.codezealot.org/archives/tag/opengl/feed"/> diff --git a/planet2/config/planet-template.html b/planet2/config/planet-template.html index a14dc62..fe39c18 100644 --- a/planet2/config/planet-template.html +++ b/planet2/config/planet-template.html @@ -38,11 +38,27 @@ <div id="sidebar"> <h3>Feeds</h3> <ul> - <#list feeds as feed> <li class="rss"> - <a href="${feed.link}">${feed.title}</a> + <a href="http://jausoft.com/blog">Sven's Blog</a> + </li> + <li class="rss"> + <a href="http://ramisantina.com/blog">Rami Santina's Blog</a> + </li> + <li class="rss"> + <a href="http://copypastaresearch.tumblr.com/">Form Over Function</a> + </li> + <li class="rss"> + <a href="http://michael-bien.com/mbien/">Michael Bien's Weblog</a> + </li> + <li class="rss"> + <a href="http://en.wordpress.com/tag/java-opengl/">java-opengl (WordPress Tag)</a> + </li> + <li class="rss"> + <a href="http://www.dyn4j.org">dyn4j</a> + </li> + <li class="rss"> + <a href="http://www.codezealot.org">Code Zealot</a> </li> - </#list> </ul> <h3>Links</h3> |