]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - gfx/hud/luma/nade_entrap.tga
Merge branch 'master' into Mario/entrap_nade
authorMario <mario@smbclan.net>
Sat, 11 Jun 2016 17:21:16 +0000 (03:21 +1000)
committerMario <mario@smbclan.net>
Sat, 11 Jun 2016 17:21:16 +0000 (03:21 +1000)
commitd100c91272ce2519d042b8f0e22da8ea9108c354
treefbda0bf3161604781676474eb28eb561e21c45c3
parentb17fb0d84428738cc995e9b6aae09c12e12b636c
parent011697b6da16f1d95db88065ab99f38d5828cfd8
Merge branch 'master' into Mario/entrap_nade
qcsrc/common/mutators/mutator/nades/nades.qc