]> 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: 3f492ed f94abbe)
Merge branch 'terencehill/strzone_fixes' into 'master'
authorMario <zacjardine@y7mail.com>
Thu, 3 Dec 2015 09:03:41 +0000 (09:03 +0000)
committerMario <zacjardine@y7mail.com>
Thu, 3 Dec 2015 09:03:41 +0000 (09:03 +0000)
strzone fixes

See merge request !261


Trivial merge