Merge branch 'master' of linz:/srv/git/slides

[slides.git] / index.html

diff --git a/index.html b/index.html
index 84f40d50eac5754c9aa3b9fc6c775aee9b63f9c2..33d1d388293ca4688a61771db89378fcf8d3b334 100644 (file)
--- a/index.html
+++ b/index.html
@@ -39,15 +39,26 @@
 </tr>
 </thead>
 <tbody>
 </tr>
 </thead>
 <tbody>

+<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>
 <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>
 </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>
 </tr>
 <tr>
   <td>FOSDEM 2012</td>


@@ -93,6 +104,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>
   <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>
 </tr>
 <tr>
   <td>Linuxwochen 2009</td>