]> de.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: bf9e79e f7adc47)
Merge branch 'Lyberta/StandaloneOverkillWeapons' into 'master'
authorMario <zacjardine@y7mail.com>
Thu, 31 May 2018 06:18:25 +0000 (06:18 +0000)
committerMario <zacjardine@y7mail.com>
Thu, 31 May 2018 06:18:25 +0000 (06:18 +0000)
Standalone Overkill weapons

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


Trivial merge