]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - textures/weapons/ok_shotgun_glow.tga
Merge branch 'Mario/overkill' into 'master'
authorMario <zacjardine@y7mail.com>
Sat, 28 Jan 2017 11:36:05 +0000 (11:36 +0000)
committerMario <zacjardine@y7mail.com>
Sat, 28 Jan 2017 11:36:05 +0000 (11:36 +0000)
commit0c46469c66df201aecb8bfd37fd089a242848097
tree3a5ab9cef335da8deedcb70bf1eeeecb837a2965
parent9d3095b486f5b548a7457f2856205f6ff55b01ac
parent7c363b8b197a333e207a4e0ba8162beca2ce9531
Merge branch 'Mario/overkill' into 'master'

Merge branch Mario/overkill (S merge request)

See merge request !407