Merge remote branch 'origin/master' into samual/config_updates
authorSamual <samual@xonotic.org>
Thu, 22 Dec 2011 21:27:24 +0000 (16:27 -0500)
committerSamual <samual@xonotic.org>
Thu, 22 Dec 2011 21:27:24 +0000 (16:27 -0500)
commit5e42a6f54307afc1263845f546bfe74a6dfa100b
treeca9a960fa3e69caf30371543664a1923d5c95461
parent8b0b9c09301682794347c4c727949706d6c952af
parentbd5ece69880b52958f63295510c3c505f163c9d9
Merge remote branch 'origin/master' into samual/config_updates
balanceFruitieX.cfg
defaultXonotic.cfg
qcsrc/server/g_world.qc