Merge branch 'master' of ssh://xonotic@git.xonotic.org/xonotic-data.pk3dir
authormand1nga <saulo_gil@argentina.com>
Thu, 18 Mar 2010 20:33:12 +0000 (17:33 -0300)
committermand1nga <saulo_gil@argentina.com>
Thu, 18 Mar 2010 20:33:12 +0000 (17:33 -0300)
commit33ef2553fa8f62dcb726d70cb35fe30419e8acb7
treef62a626adcbed220befecb417fcc877578a4e696
parentef0a0dbb32b56c7b1c66af517e309fbd1949eff7
parent270227664ac105d02dd8646cfe9967b323d33192
Merge branch 'master' of ssh://xonotic@git.xonotic.org/xonotic-data.pk3dir