Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Fri, 22 Oct 2010 21:04:48 +0000 (23:04 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 22 Oct 2010 21:04:48 +0000 (23:04 +0200)
commit32a236520a84b7ba28cfa27e9b05a43875bcbfd6
treeb6e1ef0fcdfaaef84b1cf36d0d391f31a9ec136f
parent121f5cfa91fa44116855ae169dd2adf356d3a06a
parentf9ea3c4c9d938b009e75136c84d41e2c2cbb37dc
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir

Conflicts:
balanceXonotic.cfg
balanceXonotic.cfg