Merge branch 'fruitiex/balance' into fruitiex/ctsfix
authorFruitieX <fruitiex@gmail.com>
Sun, 12 Dec 2010 10:53:24 +0000 (12:53 +0200)
committerFruitieX <fruitiex@gmail.com>
Sun, 12 Dec 2010 10:53:24 +0000 (12:53 +0200)
commit7e2aacbe5ab40622c1bda6c64d34d852f4ad3cfb
treeb24a3c8d211415d34ac24050487b1e3103a71ddf
parentf2e164498652107708fdfc9103412d219b035a28
parentce607085bc5684e0066498289cc4c19b2dab1bb6
Merge branch 'fruitiex/balance' into fruitiex/ctsfix

Conflicts:
defaultXonotic.cfg
defaultXonotic.cfg
qcsrc/server/miscfunctions.qc