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

This commit is contained in:
David Bartley 2008-02-02 19:15:45 -05:00
commit 5b5b65648f
1 changed files with 8 additions and 0 deletions

View File

@ -12,6 +12,14 @@
</p></abstract>
</eventitem>
<eventitem date="2008-02-14" time="TBA" room="TBA" title="CSC Programming Contest 1">
<short>Yes, we know this is Valentine's Day.</short>
<abstract><p>
Details will be released closer to the release date.
</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>