Merge branch 'master' of linz:/srv/git/slides
authorRobert Kaiser <kairo@kairo.at>
Thu, 26 Sep 2019 16:49:06 +0000 (18:49 +0200)
committerRobert Kaiser <kairo@kairo.at>
Thu, 26 Sep 2019 16:49:06 +0000 (18:49 +0200)
1  2 
index.html

diff --combined index.html
index f9a98a322e63726fb7cd609369bbbb15f834e511,ca6fae2c4b542e59efe25bffd5349330c8721628..dfaec7497b65ab0d97f561552df6acc914eed62d
  </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>