]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - textures/gakarmorfb_gloss.tga
Merge branch 'master' into Mario/fullbright_skins 311/head
authorMario <mario@smbclan.net>
Tue, 14 Jun 2016 13:42:28 +0000 (23:42 +1000)
committerMario <mario@smbclan.net>
Tue, 14 Jun 2016 13:42:28 +0000 (23:42 +1000)
commit30651895eb80aab99657da34d8c8cebd859bbc78
treee511bf3210929c5f7b75fa3b5d29d6688ab2852c
parent3220cab5a7b69ced4a641504a6a5f4eccf2d3bfc
parent49260b6ae3d0ffae7f73abe2da1d8a35859b162d
Merge branch 'master' into Mario/fullbright_skins