Merge branch 'master' of ssh://csclub.uwaterloo.ca/users/git/www/www
Conflicts: events.xml
This commit is contained in:
commit
9654678b0a
|
@ -26,10 +26,13 @@ novel mazes with non-trivial mathematical or aesthetic properties.
|
||||||
</p></abstract>
|
</p></abstract>
|
||||||
|
|
||||||
</eventitem>
|
</eventitem>
|
||||||
<eventitem date="2010-11-13" time="12:30 PM" room="Outside DC" title="CSC Invades Toronto">
|
<eventitem date="2010-11-13" time="12:00 PM" room="Outside DC" title="CSC Invades Toronto">
|
||||||
|
|
||||||
<short><p>The CSC is going to Toronto to visit UofT's <a href="http://cssu.cdf.toronto.edu/">CSSU</a>, see what they do, and have beer with them.
|
<short><p>The CSC is going to Toronto to visit UofT's <a href="http://cssu.cdf.toronto.edu/">CSSU</a>, see what they do, and have beer with them.
|
||||||
If you would like to come along, please come by the office and sign up. The cost for the trip is $2 per member.</p></short>
|
If you would like to come along, please come by the office and sign up. The cost for the trip is $2 per member.
|
||||||
|
|
||||||
|
The bus will be leaving from the Davis Center (DC) Saturday Nov. 13 at NOON (some people may have been told 1pm, this is an error). Please show up a few minutes early so we may
|
||||||
|
board.</p></short>
|
||||||
|
|
||||||
</eventitem>
|
</eventitem>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue