]> 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: a3f256a 343c425)
Merge branch 'martin-t/powerups' into 'master'
authorMario <zacjardine@y7mail.com>
Thu, 8 Feb 2018 00:18:05 +0000 (00:18 +0000)
committerMario <zacjardine@y7mail.com>
Thu, 8 Feb 2018 00:18:05 +0000 (00:18 +0000)
Option to spawn quad and shield at the same time

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


Trivial merge