]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
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)
1  2 
defaultXonotic.cfg

Simple merge