]> 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: 2e26588 95a1e63)
Merge branch 'terencehill/keyhunt' into 'master'
authorMario <zacjardine@y7mail.com>
Tue, 3 Jan 2017 01:34:31 +0000 (01:34 +0000)
committerMario <zacjardine@y7mail.com>
Tue, 3 Jan 2017 01:34:31 +0000 (01:34 +0000)
Keyhunt improvements

Closes #1843 and #1837

See merge request !402


Trivial merge