===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/hackathons.html,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- www/hackathons.html	2019/04/02 01:50:07	1.137
+++ www/hackathons.html	2019/05/08 13:47:24	1.138
@@ -87,11 +87,20 @@
 <table>
 <tr>
 <td>
+    <a id="g2k19" href="images/hackathons/g2k19.gif">
+    <img src="images/hackathons/g2k19-s.gif"></a><br>
+    g2k19: general hackathon<br>
+    May 7 - 14, 2019<br>
+    Ottawa, Canada<br>
+    42 developers<br>
+    Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>.
+    <br>
+<td>
     <a id="t2k19" href="images/hackathons/t2k19.gif">
     <img src="images/hackathons/t2k19-s.gif"></a><br>
     t2k19: taipei mini hackathon<br>
     Mar 28 - Apr 5, 2019<br>
-    Taipei<br>
+    Taipei, Taiwan<br>
     16 developers<br>
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     and with the support of Kevin Lo and <a href="http://www.funtoro.com">MSI/FUNTORO</a>
@@ -106,6 +115,7 @@
     Supported by the <a href="https://www.victoria.ac.nz">Victoria University of Wellington</a>
     and funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>.
     <br>
+<tr>
 <td>
     <a id="l2k18" href="images/hackathons/l2k18.jpg">
     <img src="images/hackathons/l2k18-s.gif"></a><br>
@@ -115,7 +125,6 @@
     5 developers<br>
     Supported by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>.
     <br>
-<tr>
 <td>
     <a id="n2k18" href="images/hackathons/n2k18.gif">
     <img src="images/hackathons/n2k18-s.gif"></a><br>
@@ -135,6 +144,7 @@
     39 developers<br>
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     and with the support of Mitja Mu&#382;eni&#269;.
+<tr>
 <td>
     <a id="p2k18" href="images/hackathons/p2k18.gif">
     <img src="images/hackathons/p2k18-s.gif"></a><br>
@@ -144,7 +154,6 @@
     24 developers<br>
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     and with the support of <a href="http://www.epitech.eu">Epitech Nantes</a>.
-<tr>
 <td>
     <a id="a2k18" href="images/hackathons/a2k18.gif">
     <img src="images/hackathons/a2k18-s.gif"></a><br>
@@ -163,6 +172,7 @@
     10 developers<br>
     Funded by <a href="http://www.foretell.ca">ForeTell Technologies</a>
     and with the support of <a href="http://www.xplornet.ca">Xplornet</a>.
+<tr>
 <td>
     <a id="p2k17" href="images/hackathons/p2k17.gif">
     <img src="images/hackathons/p2k17-s.gif"></a><br>
@@ -173,7 +183,6 @@
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     with the support of <a href="http://www.in-berlin.de">IN-Berlin</a> and
     <a href="http://www.hostserver.de/">Hostserver</a>.
-<tr>
 <td>
     <a id="t2k17" href="images/hackathons/t2k17.jpg">
     <img src="images/hackathons/t2k17-s.gif"></a><br>
@@ -192,6 +201,7 @@
     24 developers<br>
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     and with the support of <a href="http://www.genua.de">genua</a>.
+<tr>
 <td>
     <a id="noshirt" href="images/hackathons/noshirt-s.gif">
     <img src="images/hackathons/noshirt-s.gif"></a><br>
@@ -200,7 +210,6 @@
     Edmonton, Canada<br>
     5 developers<br>
     With the support of Bob Beck.
-<tr>
 <td>
     <a id="a2k17" href="images/hackathons/a2k17.gif">
     <img src="images/hackathons/a2k17-s.gif"></a><br>
@@ -231,6 +240,7 @@
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     with the help of <a href="http://www.enseeiht.fr">ENSEEIHT</a> and
     <a href="http://www.objectif-libre.com">Objectif Libre</a>.
+<tr>
 <td>
     <a id="b2k16" href="images/hackathons/b2k16.gif">
     <img src="images/hackathons/b2k16-s.gif"></a><br>
@@ -239,7 +249,6 @@
     Budapest, Hungary<br>
     10 developers<br>
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>.
-<tr>
 <td>
     <a id="g2k16" href="images/hackathons/g2k16.gif">
     <img src="images/hackathons/g2k16-s.gif"></a><br>
@@ -260,6 +269,7 @@
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     and <a href="http://www.oracle.com">Oracle</a>, with the help of
     <a href="http://cuni.cz">Charles University</a>.
+<tr>
 <td>
     <a id="p2k16" href="images/hackathons/p2k16.gif">
     <img src="images/hackathons/p2k16-s.gif"></a><br>
@@ -269,7 +279,6 @@
     22 developers<br>
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     and with the support of <a href="http://www.epitech.eu">Epitech Nantes</a>.
-<tr>
 <td>
     <a id="n2k15" href="images/hackathons/n2k15.gif">
     <img src="images/hackathons/n2k15-s.gif"></a><br>
@@ -288,6 +297,7 @@
     22 developers<br>
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     and with the support of <a href="http://www.in-berlin.de">IN-Berlin</a>.
+<tr>
 <td>
     <a id="l2k15" href="images/hackathons/l2k15.gif">
     <img src="images/hackathons/l2k15-s.gif"></a><br>
@@ -297,7 +307,6 @@
     17 developers<br>
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     with help of the <a href="http://foi.unizg.hr">Open Systems and Security Lab</a>.
-<tr>
 <td>
     <a id="j2k15" href="images/hackathons/j2k15.gif">
     <img src="images/hackathons/j2k15-s.gif"></a><br>
@@ -315,6 +324,7 @@
     45 developers<br>
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     and with the support of <a href="http://sait.ca">SAIT</a>.
+<tr>
 <td>
     <a id="p2k15" href="images/hackathons/p2k15.gif">
     <img src="images/hackathons/p2k15-s.gif"></a><br>
@@ -324,7 +334,6 @@
     14 developers<br>
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     and with the support of Andy Henderson.
-<tr>
 <td>
     <a id="s2k15" href="images/hackathons/s2k15.gif">
     <img src="images/hackathons/s2k15-s.gif"></a><br>
@@ -343,6 +352,7 @@
     49 developers<br>
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     and with the support of Mitja Mu&#382;eni&#269;.
+<tr>
 <td>
     <a id="m2k14" href="images/hackathons/m2k14.gif">
     <img src="images/hackathons/m2k14-s.gif"></a><br>
@@ -352,7 +362,6 @@
     12 developers<br>
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     and with the support of <a href="http://www.uca.ma/">Universit&eacute; Cadi Ayyad</a>.
-<tr>
 <td>
     <a id="n2k14" href="images/hackathons/n2k14.gif">
     <img src="images/hackathons/n2k14-s.gif"></a><br>
@@ -371,6 +380,7 @@
     21 developers<br>
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     and with the support of <a href="http://www.in-berlin.de">IN-Berlin</a>.
+<tr>
 <td>
     <a id="t2k13" href="images/hackathons/t2k13.jpg">
     <img src="images/hackathons/t2k13-s.gif"></a><br>
@@ -380,7 +390,6 @@
     43 developers<br>
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     and with the support of <a href="http://www.utoronto.ca">University of Toronto</a>.
-<tr>
 <td>
     <a id="n2k13" href="images/hackathons/n2k13.gif">
     <img src="images/hackathons/n2k13-s.gif"></a><br>
@@ -399,6 +408,7 @@
     10 developers<br>
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     and with the support of <a href="http://www.uc.pt">University of Coimbra</a>.
+<tr>
 <td>
     <a id="p2k12" href="images/hackathons/p2k12.gif">
     <img src="images/hackathons/p2k12-s.gif"></a><br>
@@ -408,7 +418,6 @@
     9 developers<br>
     Funded by <a href="donations.html">donations to
     The OpenBSD Project</a>.
-<tr>
 <td>
     <a id="n2k12" href="images/hackathons/n2k12.gif">
     <img src="images/hackathons/n2k12-s.gif"></a><br>
@@ -425,6 +434,7 @@
     Budapest, Hungary<br>
     41 developers<br>
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>.
+<tr>
 <td>
     <a id="r2k12" href="images/hackathons/r2k12.gif">
     <img src="images/hackathons/r2k12-s.gif"></a><br>
@@ -435,7 +445,6 @@
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     and support of <a href="http://www.ihp.fr">Institute Henri Poincar&eacute;</a> and
     <a href="http://www.u-psud.fr">Paris-Sud University</a>.
-<tr>
 <td>
     <a id="p2k11" href="images/hackathons/p2k11.gif">
     <img src="images/hackathons/p2k11-s.gif"></a><br>
@@ -454,6 +463,7 @@
     8 developers<br>
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     and with the support of <a href="http://www.uc.pt">University of Coimbra</a>.
+<tr>
 <td>
     <a id="s2k11" href="images/hackathons/s2k11.jpg">
     <img src="images/hackathons/s2k11-s.gif"></a><br>
@@ -463,7 +473,6 @@
     25 developers<br>
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     and with the support of Mitja Mu&#382;eni&#269;.
-<tr>
 <td>
     <a id="c2k11" href="images/hackathons/c2k11.gif">
     <img src="images/hackathons/c2k11-s.gif"></a><br>
@@ -480,6 +489,7 @@
     Hafnarfjordur, Iceland<br>
     15 developers<br>
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>.
+<tr>
 <td>
     <a id="p2k10" href="images/hackathons/p2k10.gif">
     <img src="images/hackathons/p2k10-s.gif"></a><br>
@@ -489,7 +499,6 @@
     19 developers<br>
     Funded by <a href="donations.html">donations to
     the OpenBSD Project</a>.
-<tr>
 <td>
     <a id="j2k10" href="images/hackathons/j2k10.gif">
     <img src="images/hackathons/j2k10-s.gif"></a><br>
@@ -505,6 +514,7 @@
     Edmonton, Alberta<br>
     46 developers<br>
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>.
+<tr>
 <td>
     <br>
     <br>
@@ -522,7 +532,6 @@
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     and support of
     <a href="http://vpac.org">Victorian Partnership for Advanced Computing</a>
-<tr>
 <td>
     <a id="h2k9" href="images/hackathons/h2k9.gif">
     <img src="images/hackathons/h2k9-s.gif"></a><br>
@@ -542,6 +551,7 @@
     14 developers<br>
     Funded by <a href="donations.html">donations to
     the OpenBSD Project</a>.
+<tr>
 <td>
     <a id="f2k9" href="images/hackathons/f2k9.gif">
     <img src="images/hackathons/f2k9-s.gif"></a><br>
@@ -550,7 +560,6 @@
     Stockholm, Sweden<br>
     14 developers<br>
     Funded by <a href="https://www.iis.se/english/">.se Foundation</a>.
-<tr>
 <td>
     <a id="c2k9" href="images/hackathons/c2k9.gif">
     <img src="images/hackathons/c2k9-s.gif"></a><br>
@@ -567,6 +576,7 @@
     Jan 26 - 30, 2009<br>
     Basel, Switzerland<br>
     19 developers<br>
+<tr>
 <td>
     <a id="h2k8" href="images/hackathons/h2k8.gif">
     <img src="images/hackathons/h2k8-s.gif"></a><br>
@@ -577,7 +587,6 @@
     Funded by <a href="donations.html">donations to
     the OpenBSD Project</a>
     and with the support of <a href="http://www.uc.pt">University of Coimbra</a>.
-<tr>
 <td>
     <a id="p2k8" href="images/hackathons/p2k8.gif">
     <img src="images/hackathons/p2k8-s.gif"></a><br>
@@ -595,6 +604,7 @@
     Edmonton, Alberta<br>
     55 developers<br>
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>.
+<tr>
 <td>
     <a id="n2k8" href="images/hackathons/n2k8.gif">
     <img src="images/hackathons/n2k8-s.gif"></a><br>
@@ -604,7 +614,6 @@
     18 developers<br>
     Funded by <a href="donations.html">donations to
     the OpenBSD Project</a> and Mark Uemura.
-<tr>
 <td>
     <a id="h2k7" href="images/hackathons/h2k7.gif">
     <img src="images/hackathons/h2k7-s.gif"></a><br>
@@ -624,6 +633,7 @@
     13 developers<br>
     Funded by <a href="donations.html">donations to
     the OpenBSD Project</a>.
+<tr>
 <td>
     <a id="c2k7" href="images/hackathons/c2k7.gif">
     <img src="images/hackathons/c2k7-s.gif"></a><br>
@@ -633,7 +643,6 @@
     50 developers<br>
     Funded by <a href="donations.html">donations to
     the OpenBSD Project</a>.
-<tr>
 <td>
     <a id="f2k7" href="images/hackathons/f2k7.gif">
     <img src="images/hackathons/f2k7-s.gif"></a><br>
@@ -653,6 +662,7 @@
     Funded by <a href="donations.html">donations to
     the OpenBSD Project</a>
     and with the support of <a href="http://www.uc.pt">University of Coimbra</a>.
+<tr>
 <td>
     <a id="p2k6" href="images/hackathons/p2k6.gif">
     <img src="images/hackathons/p2k6-s.gif"></a><br>
@@ -662,7 +672,6 @@
     14 developers<br>
     Funded by <a href="donations.html">donations to
     the OpenBSD Project</a>.
-<tr>
 <td>
     <a id="k2k6" href="images/hackathons/k2k6.gif">
     <img src="images/hackathons/k2k6-s.gif"></a><br>
@@ -678,6 +687,7 @@
     Hamburg, Germany<br>
     6 developers<br>
     Support of Henning Brauer.
+<tr>
 <td>
     <a id="c2k6" href="images/hackathons/c2k6.gif">
     <img src="images/hackathons/c2k6-s.gif"></a><br>
@@ -687,7 +697,6 @@
     47 developers<br>
     Funded by <a href="donations.html">donations to
     the OpenBSD Project</a>.
-<tr>
 <td>
     <a id="v2k5" href="images/hackathons/v2k5.gif">
     <img src="images/hackathons/v2k5-s.gif"></a><br>
@@ -706,6 +715,7 @@
     60 developers<br>
     Funded by <a href="donations.html">donations to
     the OpenBSD Project</a>.
+<tr>
 <td>
     <a id="c2k4" href="images/hackathons/c2k4.gif">
     <img src="images/hackathons/c2k4-s.gif"></a><br>
@@ -715,7 +725,6 @@
     46 developers<br>
     Funded by <a href="donations.html">donations to
     the OpenBSD Project</a>.
-<tr>
 <td>
     <a id="pf2k4" href="images/hackathons/pf2k4.gif">
     <img src="images/hackathons/pf2k4-s.gif"></a><br>
@@ -733,6 +742,7 @@
     51 developers<br>
     Funded by <a href="https://www.nlnetlabs.nl">NLnet</a>
     (after DARPA pulled out their support).
+<tr>
 <td>
     <a id="c2k2" href="images/hackathons/c2k2.gif">
     <img src="images/hackathons/c2k2-s.gif"></a><br>
@@ -741,7 +751,6 @@
     Calgary, Alberta<br>
     42 developers<br>
     Funded by DARPA.
-<tr>
 <td>
     <a id="c2k1-2" href="images/hackathons/noshirt-s.gif">
     <img src="images/hackathons/noshirt-s.gif"></a><br>
@@ -757,6 +766,7 @@
     Cambridge, Massachusetts<br>
     25 developers<br>
     Funded by DARPA with the support of <a href="http://www.mit.edu">MIT</a>.
+<tr>
 <td>
     <a id="c2k" href="images/hackathons/noshirt-s.gif">
     <img src="images/hackathons/noshirt-s.gif"></a><br>
@@ -766,7 +776,6 @@
     18 developers<br>
     Funded by <a href="donations.html">donations to
     the OpenBSD Project</a>.
-<tr>
 <td>
     <a id="c99" href="images/hackathons/noshirt-s.gif">
     <img src="images/hackathons/noshirt-s.gif"></a><br>