Merge remote branch 'origin/divVerent/map-weapon-rebalance'
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 15 Nov 2010 10:53:44 +0000 (11:53 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 15 Nov 2010 10:53:44 +0000 (11:53 +0100)
commit45054c876ab36a017a46a0955ff4f2681e9ed6c4
treedc96d34f247499d3065c19bfe696565fe5d75f9d
parentb271a2e7187930fa2f0b93372d2622e95180257e
parent575fbdca1865e3e9ae1377e9567a7b46c496b826
Merge remote branch 'origin/divVerent/map-weapon-rebalance'