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

foo
Matthew Thiffault 14 years ago
commit a4aba7b613
  1. 2
      Makefile
  2. 4
      common.mk.in
  3. 18
      events.xml
  4. 6
      library/Makefile
  5. 2
      menu.xml

@ -2,7 +2,7 @@ SHELL = umask 002; exec /bin/sh
FILES = events.ics events.atom news.atom index.html stats.html \
favicon.ico default.css csclub.der csclub.pem
SUBDIRS = about events office news services media buttons logos flash
SUBDIRS = about events office news services media buttons logos flash library
include common.mk

@ -37,6 +37,10 @@ $(OUTDIR)%.ics: %.xml
$(OUTDIR)%.html: %.html
cp -f $< $@
$(OUTDIR)%.cgi: %.cgi
cp -f $< $@
$(OUTDIR).htaccess:
cp -f .htaccess $@
$(OUTDIR)%.ico: %.ico
cp -f $< $@
$(OUTDIR)%.css: %.css

@ -59,16 +59,26 @@ and its guranteed to be dazzling.
</abstract>
</eventitem>
<eventitem date="2009-03-12" time="5:00 PM" etime="7:00 PM" room="TBA"
<eventitem date="2009-03-12" time="5:00 PM" etime="7:00 PM" room="RAC2009"
title="IQC - Programming Quantum Computers">
<short>
<p>
A brief intro to Quantum Computing and why it matters,
followed by a talk on programming quantum computers.
followed by a talk on programming quantum computers. Meet at
the CSC at 4:00PM for a guided walk to the RAC.
</p>
</short>
<abstract><p>
TBA</p></abstract>
<abstract>
<p>
Raymond Laflamme is the director of the Institute for Quantum
Computing at the University of Waterloo and holds the Canada
Research Chair in Quantum Information. He will give a brief
introduction to quantum computing and why it matters, followed
by a talk on programming quantum computers. There will be
tours of the IQC labs at the end, and pizza will be provided
back at the CSC for all attendees.
</p>
</abstract>
</eventitem>
<eventitem date="2009-02-27" time="5:00 PM" etime="7:00 PM" room="CSC Office: MC3036" title="Dooly's Night">

@ -0,0 +1,6 @@
FILES = index.cgi .htaccess
RELDIR = library/
include ../common.mk
.htaccess: .htaccess
cp -f $< $@

@ -10,5 +10,5 @@
<menuitem title="Mailman" icon="mailman" absolute="true" href="/mailman/"/>
<menuitem title="gitweb" icon="gitweb" absolute="true" href="http://gitweb.csclub.uwaterloo.ca/"/>
<menuitem title="Gallery" icon="gallery" absolute="true" href="/gallery2/"/>
<menuitem title="Library" icon="gallery" absolute="true" href="http://csclub.uwaterloo.ca/~mthiffau/cgi-bin/library.cgi" />
<menuitem title="Library" icon="gallery" absolute="true" href="http://csclub.uwaterloo.ca/library" />
</menudefs>

Loading…
Cancel
Save