]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - models/player/megaerebus_lod1.iqm_0.skin
Merge remote branch 'origin/master' into tzork/turrets-csqc
authorJakob MG <jakob_mg@hotmail.com>
Sun, 19 Jun 2011 14:28:20 +0000 (16:28 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Sun, 19 Jun 2011 14:28:20 +0000 (16:28 +0200)
commita484319f89b4267fa8bbb631b060df92e2eddbaf
treeba2c1a73c78cdae6c51e1edb4be1a91e027c45cc
parent813817fff75452352982dd94bd2d6a34a819db3c
parent12c43c521acd4f7f9adfb7d6547203c35eb1e7bc
Merge remote branch 'origin/master' into tzork/turrets-csqc