===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/hackathons.html,v
retrieving revision 1.42
retrieving revision 1.43
diff -c -r1.42 -r1.43
*** www/hackathons.html	2012/04/11 11:14:55	1.42
--- www/hackathons.html	2012/07/07 09:15:42	1.43
***************
*** 386,391 ****
--- 386,400 ----
      Apr 10 - 14, 2012<br>
      Paris, France<br>
      16 developers<br>
+ </td>
+ <td>
+     <a id="g2k12" href="images/hackathons/g2k12.gif">
+     <img src="images/hackathons/g2k12-s.gif"></a><br>
+     g2k12: general hackathon<br>
+     Jul 7 - 14, 2012<br>
+     Budapest, Hungary<br>
+     41 developers<br>
+ </td>
  </tr><tr><td bgcolor="#000000" colspan="3"></td>
  </tr><tr valign="bottom">
  </tr></table>
***************
*** 397,409 ****
  n2k10 drawn by Theo de Raadt, refined by Ty Semaka.<br>
  c2k10, j2k10, and p2k10 drawn by Damon Mlekuz.<br>
  k2k11 drawn by Brett Lambert.<br>
! r2k12 drawn by Markus Hall.<br>
  All other artwork drawn by Ty Semaka.<br>
  
  <hr>
  <a href="index.html"><img height="24" width="24" src="back.gif" border="0" alt="OpenBSD"></a>
  <a href="mailto:www@openbsd.org">www@openbsd.org</a>
! <br><small>$OpenBSD: hackathons.html,v 1.42 2012/04/11 11:14:55 deraadt Exp $</small>
  
  </body>
  </html>
--- 406,418 ----
  n2k10 drawn by Theo de Raadt, refined by Ty Semaka.<br>
  c2k10, j2k10, and p2k10 drawn by Damon Mlekuz.<br>
  k2k11 drawn by Brett Lambert.<br>
! r2k12, g2k12 drawn by Markus Hall.<br>
  All other artwork drawn by Ty Semaka.<br>
  
  <hr>
  <a href="index.html"><img height="24" width="24" src="back.gif" border="0" alt="OpenBSD"></a>
  <a href="mailto:www@openbsd.org">www@openbsd.org</a>
! <br><small>$OpenBSD: hackathons.html,v 1.43 2012/07/07 09:15:42 deraadt Exp $</small>
  
  </body>
  </html>