===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.387
retrieving revision 1.388
diff -c -r1.387 -r1.388
*** www/events.html 2005/08/07 20:38:16 1.387
--- www/events.html 2005/08/07 20:43:11 1.388
***************
*** 28,40 ****
- -
- UKUUG Linux Technical Conference 2005,
- August 4 - 7, 2005, University of Wales, Swansea, UK
- Tom Cosgrove will be giving Theo de Raadt's presentation about
- Exploit Mitigation Techniques.
-
-
-
OpenCON 2005,
November 4 - 6, 2005, San Servolo Island, Venice, Italy.
--- 28,33 ----
***************
*** 81,86 ****
--- 74,86 ----
+ -
+ UKUUG Linux Technical
+ Conference 2005,
+ August 4 - 7, 2005, University of Wales, Swansea, UK
+ Tom Cosgrove gave Theo's presentation about Exploit Mitigation Techniques.
+
+
-
What the Hack 2005,
July 28 - 31, 2005, Den Bosch, The Netherlands.
***************
*** 1557,1563 ****
www@openbsd.org
!
$OpenBSD: events.html,v 1.387 2005/08/07 20:38:16 tom Exp $