]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0177db1 bfce4a2)
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)

Trivial merge