Merge remote branch 'origin/master'
authorRudolf Polzer <divVerent@xonotic.org>
Wed, 6 Oct 2010 08:29:41 +0000 (10:29 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Wed, 6 Oct 2010 08:29:41 +0000 (10:29 +0200)
commitb9bede8374a53ef578aefc574672bf9af982ba8b
tree6b0a31ed700077128974c65f9e73568a4b07f025
parentf466310e2d21c4a27ddf6350d7c14a95e2f2e8b1
parent7b09088e4413ea1e38fcda23fe1921aa31bc8616
Merge remote branch 'origin/master'
balanceLeeStricklin.cfg