Merge remote branch 'origin/master' into samual/balance_testing
authorSamual <samual@xonotic.org>
Sun, 19 Feb 2012 22:56:08 +0000 (17:56 -0500)
committerSamual <samual@xonotic.org>
Sun, 19 Feb 2012 22:56:08 +0000 (17:56 -0500)
commitb517c2b5df8b140a9385b0b20832d293daf66252
tree4985805ce1d94c106a93bae19d5c88cb286de9a1
parent2c48bae23859d4fe22c2e06a941f0f2716a1513a
parent00c0fca6ca363959fc18f6348375e05b10bd26b6
Merge remote branch 'origin/master' into samual/balance_testing
balanceXPM.cfg
balanceXonotic.cfg