From: Robert Kaiser <kairo@kairo.at>
Date: Thu, 26 Sep 2019 16:49:06 +0000 (+0200)
Subject: Merge branch 'master' of linz:/srv/git/slides
X-Git-Url: https://git-public.kairo.at/?p=slides.git;a=commitdiff_plain;h=e9ed6c931a96cb1aef29f55021d71bf941a0832a;hp=-c

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

e9ed6c931a96cb1aef29f55021d71bf941a0832a
diff --combined index.html
index f9a98a3,ca6fae2..dfaec74
--- a/index.html
+++ b/index.html
@@@ -40,6 -40,13 +40,13 @@@
  </tr>
  </thead>
  <tbody>
+ <tr>
+   <td>State of the Map 2019</td>
+   <td><a href="sotm2019/">VR Map: Using OSM Data In a WebVR Environment</a></td>
+   <td>English</td>
+   <td><a href="https://2019.stateofthemap.org/sessions/9TMRYN">overview</a><!--,
+       <a href="">video</a --></td>
+ </tr>
  <tr>
    <td>WeAreDevelopers World Congress 2019</td>
    <td><a href="wearedevs2019/">VR Map: WebXR Using Data From OpenStreetMap</a></td>
@@@ -50,9 -57,7 +57,9 @@@
    <td>Linuxwochen 2019</td>
    <td><a href="linuxwochen2019/">VR Map: WebXR with OpenStreetMap Data</a></td>
    <td>English</td>
 -  <td><a href="https://cfp.linuxwochen.at/de/LWW19/public/events/946">overview</a></td>
 +  <td><a href="https://cfp.linuxwochen.at/de/LWW19/public/events/946">overview</a>,
 +      <a href="https://media.ccc.de/v/sotm2019-945-vr-map-using-osm-data-in-a-webvr-environment">video</a>
 +      <!-- https://www.youtube.com/watch?v=KzMQhT6h7U4 --></td>
  </tr>
  <tr>
    <td rowspan="2">FOSDEM 2019</td>