]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'refs/remotes/origin/diabolik/weaponscale'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 18 May 2010 19:00:24 +0000 (21:00 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 18 May 2010 19:00:24 +0000 (21:00 +0200)
commit5161f70e40526b9a7f1ed8415e391664be6bc39b
tree7f4a6964991b2566eb788019f25723bba5bfbe9f
parent3776190452e1e15310ce6fd223b932a17dec9166
parentdb7e471bc548dbc8ad3d70ed9b6079525af6f218
Merge remote branch 'refs/remotes/origin/diabolik/weaponscale'