]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into mirceakitsune/new_shotgun_uzi mirceakitsune/new_shotgun_uzi
authorMario <mario.mario@y7mail.com>
Sun, 18 Oct 2020 22:41:19 +0000 (08:41 +1000)
committerMario <mario.mario@y7mail.com>
Sun, 18 Oct 2020 22:41:19 +0000 (08:41 +1000)
commit2310207e9943ed17f8bbb6112222af1df08300c2
tree3701b7126eaf8419677636de0aaa1cde2b84745e
parent0177db14ed5d306044f19375bc32eb58380229fe
parentbfce4a2d283acc6df146046e866b8d05a3106266
Merge branch 'master' into mirceakitsune/new_shotgun_uzi