]> 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: 83e2013 81808ae)
Merge branch 'martin-t/insta' into 'master'
authorMario <zacjardine@y7mail.com>
Fri, 25 Aug 2017 11:32:38 +0000 (11:32 +0000)
committerMario <zacjardine@y7mail.com>
Fri, 25 Aug 2017 11:32:38 +0000 (11:32 +0000)
Disable damagetext in instagib

See merge request !463


Trivial merge