www
/
www
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Merge branch 'master' of ssh://csclub.uwaterloo.ca/users/git/www/www 

Conflicts:
	events.xml
This commit is contained in:
Jennifer Yeelam Wong 2011-03-16 16:10:08 -04:00
parent 416167bb75 f176137835
commit a9eb86ecbe
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
events.xml
View File

@ -17,6 +17,10 @@
</abstract>
</eventitem>
<<<<<<< HEAD
=======
>>>>>>> f176137835745620bb6a3bc79175de9c375bbc30
<eventitem date="2011-02-17" time="07:00 PM" room="MC2017" title="A Smorgasbord of Perl Talks">
<short><p><i>by KW Perl Mongers</i>. These talks are intended for programmers who are curious about the Swiss Army Chainsaw of languages, Perl.</p></short>