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

This commit is contained in:
Michael Gregson 2008-01-27 18:12:55 -05:00
commit 7ca972d110
1 changed files with 7 additions and 0 deletions

View File

@ -5,6 +5,13 @@
<!-- Winter 2008 -->
<eventitem date="2008-02-29" time="5:00 PM" room="TBA" title="Overview of Quantum Computing">
<short>Raymond Laflamme</short>
<abstract><p>
TBA
</p></abstract>
</eventitem>
<eventitem date="2008-01-23" time="5:00 PM" room="MC 4020" title="Creating Distributed Applications with TIPC">
<short>Elmer Horvath</short>
<abstract><p>