]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - textures/items/explosiveammo_icon_blank.tga
Merge branch 'Mario/morphed_explosivesmodel' into 'master'
authorMario <zacjardine@y7mail.com>
Mon, 25 Jun 2018 03:16:21 +0000 (03:16 +0000)
committerMario <zacjardine@y7mail.com>
Mon, 25 Jun 2018 03:16:21 +0000 (03:16 +0000)
commita8e11f490f08342fc48c332412c8fc6e23f3d171
tree441aa2a2cbea9336ea55441eec143ac210d76639
parent8f62b609486c7bd6837e453edbbc2934f8e1674a
parent8ab2ca8eaa8860abfe6ccaf34ebf5c013916308f
Merge branch 'Mario/morphed_explosivesmodel' into 'master'

Merge branch Mario/morphed_explosivesmodel (XS merge request)

Closes #2045

See merge request xonotic/xonotic-data.pk3dir!572