Merge remote branch 'refs/remotes/origin/fruitiex/vote_simplemajority'
authorRudolf Polzer <divVerent@xonotic.org>
Wed, 13 Oct 2010 07:29:48 +0000 (09:29 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Wed, 13 Oct 2010 07:29:48 +0000 (09:29 +0200)
commit150ef5e654ce6742d1560feb7b5c69bbddececb3
tree1ceb5c041ce5bddda415599aef50f81ec5321e90
parentf48ec6f2577c9010f46bd66cb8f6ce8c908c6dd1
parent11fa9f109eed067836df4d9dcc3de8543ff0a76d
Merge remote branch 'refs/remotes/origin/fruitiex/vote_simplemajority'
defaultXonotic.cfg