===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.833
retrieving revision 1.834
diff -u -r1.833 -r1.834
--- www/events.html 2010/05/30 13:31:08 1.833
+++ www/events.html 2010/07/06 23:16:54 1.834
@@ -40,10 +40,22 @@
2010
+
+-
+OSCON 2010,
+Jul 19 - 23, 2010, Portland, Oregon, USA.
+OpenBSD CD's and accessories will be available at Booth 802 in the exhibitor
+area on Wednesday and Thursday (July 21st & 22nd) of the week long event.
+Developer Jacob Meuser, audio specialist, will be there to talk tech. with passers by,
+and any other OpenBSD developers in the area are encouraged to join in.
+Seth Fulton, Austin Hook and others will assist.
+
+
-
EuroBSDCon 2010,
Oct 8 - 10, 2010, Karlsruhe, Germany.
+
@@ -2889,7 +2901,7 @@
www@openbsd.org
-
$OpenBSD: events.html,v 1.833 2010/05/30 13:31:08 jasper Exp $
+
$OpenBSD: events.html,v 1.834 2010/07/06 23:16:54 austin Exp $