Merge branch 'mand1nga/rebrand' of ssh://git.xonotic.org/xonotic-data.pk3dir into...
authormand1nga <saulo_gil@argentina.com>
Sun, 6 Jun 2010 02:13:18 +0000 (23:13 -0300)
committermand1nga <saulo_gil@argentina.com>
Sun, 6 Jun 2010 02:13:18 +0000 (23:13 -0300)
commit715202f719f244160bfc0b004013fa6e1bcc5668
treedb0d1b51129a684cc6b183975c7d38af3f91b6fc
parent42b95c4083db29b08b6605faa945162aee88a65b
parent1f27398e6b469fee0b07704fc135f12359b9bde5
Merge branch 'mand1nga/rebrand' of ssh://git.xonotic.org/xonotic-data.pk3dir into mand1nga/rebrand