X-Git-Url: https://git-public.kairo.at/?p=slides.git;a=blobdiff_plain;f=index.html;h=25cf6ff92c6238b1ff4517eef50414d31672e193;hp=ee47157b99c9debeb2d6cd1332773ec0b402a85e;hb=b41707de4c4f88a5d499c0854a8762391cfae9fd;hpb=95e7da632f5e206c927cf07105927fa75806ca1a

diff --git a/index.html b/index.html
index ee47157..25cf6ff 100644
--- a/index.html
+++ b/index.html
@@ -39,15 +39,46 @@
 </tr>
 </thead>
 <tbody>
+<tr>
+  <td rowspan="2">Linuxwochen 2014</td>
+  <td><a href="linuxwochen2014-fxos/">Firefox OS: Das Web als Betriebssystem</a></td>
+  <td>German/Deutsch</td>
+</tr>
+<tr>
+  <td><a href="linuxwochen2014-makey/">MaKey MaKey - "Tastatur"-Kreativität</a></td>
+  <td>German/Deutsch</td>
+</tr>
+<tr>
+  <td>FOSDEM 2014</td>
+  <td><a href="fosdem2014/">Developing Webapps for Firefox OS - The Efficient &amp; Simplistic Approach</a> (with Sayak Sarkar)</td>
+  <td>English</td>
+  <!-- http://video.fosdem.org/2014/UD2218A/Saturday/Developing_Webapps_for_Firefox_OS.webm -->
+</tr>
+<tr>
+  <td>FirefoxOS DevTreff Austria</a></td>
+  <td><a href="devtreff201311/">Firefox OS: Reasons, Status &amp; Plans</a></td>
+  <td>English</td>
+</tr>
+<tr>
+  <td rowspan="2">Linuxwochen 2013</td>
+  <td><a href="linuxwochen2013-mozilla/">Mozilla - Das Web ist die Plattform</a></td>
+  <td>German/Deutsch</td>
+</tr>
+<tr>
+  <td><a href="linuxwochen2013-makey/">MaKey MaKey - "Tastatur"-Kreativität</a></td>
+  <td>German/Deutsch</td>
+</tr>
 <tr>
   <td>FOSDEM 2013</td>
   <td><a href="fosdem2013/">Improving Stability of Mozilla Products</a></td>
   <td>English</td>
+  <!-- https://air.mozilla.org/improving-the-stability-of-mozilla-products/ -->
 </tr>
 <tr>
   <td>Mozilla Brown Bag, 2012</td>
   <td><a href="brownbag-crashlife-2012/">The Life Cycle of a Firefox Crash</a></td>
   <td>English</td>
+  <!-- https://air.mozilla.org/crash-life-cycl/ -->
 </tr>
 <tr>
   <td>FOSDEM 2012</td>
@@ -93,6 +124,7 @@
   <td>UBIT Wien - IT Extrazimmer, 01.07.2009</td>
   <td><a href="ubit-wien-2009/">Open-Source-Projektmanagement</a></td>
   <td>German/Deutsch</td>
+  <!-- http://www.youtube.com/watch?v=N_byj811a48 -->
 </tr>
 <tr>
   <td>Linuxwochen 2009</td>
@@ -115,10 +147,13 @@
   <td><a href="fosdem2009/">SeaMonkey 2 &amp; The Vision Beyond</a></td>
   <td>English</td>
 </tr>
+<tr>
+  <td>Mozilla Brown Bag, April 7, 2008
+  <td rowspan="2"><a href="fosdem2008/">And the beast shall come forth... - Community Project Organization and SeaMonkey 2</a></td>
+  <td rowspan="2">English</td>
+</tr>
 <tr>
   <td>FOSDEM 2008</td>
-  <td><a href="fosdem2008/">And the beast shall come forth... - Community Project Organization and SeaMonkey 2</a></td>
-  <td>English</td>
 </tr>
 <tr>
   <td>FOSDEM 2007</td>