Merge branch 'master' into build
authorDavid Bartley <dtbartle@csclub.uwaterloo.ca>
Sat, 6 Oct 2007 20:25:48 +0000 (16:25 -0400)
committerDavid Bartley <dtbartle@csclub.uwaterloo.ca>
Sat, 6 Oct 2007 20:25:48 +0000 (16:25 -0400)
commit5a336c048851d745421a2c534915b2a4f23477cd
treeda09219bc37f02531562722d887e77c6bee3f69e
parent1f5b3758209d94e72a5c3e3794062eaace845172
parent9f044bec8d3da34de73201e6326e6b825f4f365e
Merge branch 'master' into build

Conflicts:

Makefile
default.mk.in
Makefile