]> 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: 4ea1ef8 771f981)
Merge branch 'morosophos/vampire-improvements' into 'master'
authorMario <zacjardine@y7mail.com>
Fri, 12 Jul 2019 10:41:19 +0000 (10:41 +0000)
committerMario <zacjardine@y7mail.com>
Fri, 12 Jul 2019 10:41:19 +0000 (10:41 +0000)
Vampire improvements

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


Trivial merge