Merge branch 'master' of caffeine:/users/www/www

This commit is contained in:
David Bartley 2009-03-10 00:11:36 -04:00
commit e792b3c1c3
1 changed files with 17 additions and 2 deletions

View File

@ -5,6 +5,21 @@
<!-- Winter 2009 -->
<eventitem date="2009-03-05" time="4:30 PM" edate="2009-03-05" etime="6:30 PM" room="Comfy Lounge" title="SIGGRAPH Night">
<short><p>Come out and watch the SIGGRAPH (Special Interest Group on Graphics) conference video review. A video of insane, amazing, and mind blowing computer graphics. .
</p></short>
<abstract><p>The ACM SIGGRAPH (Special Interest Group on Graphics) hosts a conference yearly in which the
latest and greatest in computer graphics premier. They record video and as a result produce a
very nice Video Review of the conference. Come join us watching these videos, as well as a
few professors from the UW Computer Graphics Lab. There will be some kind of food and drink,
and its guranteed to be dazzling.
</p></abstract>
</eventitem>
<eventitem date="2009-03-12" time="8:00 AM" edate="2009-03-13" etime="9:00 PM"
room="Toronto Hilton" title="Canadian Undergraduate Technology Conference">
<short>
@ -48,8 +63,8 @@
title="IQC - Programming Quantum Computers">
<short>
<p>
A brief intro Quantum Computing and why it matters, followed by a talk on programming
quantum computers.
A brief intro to Quantum Computing and why it matters,
followed by a talk on programming quantum computers.
</p>
</short>
<abstract><p>