]> 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: 2f17814 d483163)
Merge branch 'Mario/spike_removal' into 'master'
authorMario <mario.mario@y7mail.com>
Tue, 10 Sep 2019 13:31:46 +0000 (13:31 +0000)
committerMario <mario.mario@y7mail.com>
Tue, 10 Sep 2019 13:31:46 +0000 (13:31 +0000)
Merge branch Mario/spike_removal (XS merge request)

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


Trivial merge