]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'martin-t/okc' into 'master'
authorMario <zacjardine@y7mail.com>
Sun, 27 Aug 2017 19:20:22 +0000 (19:20 +0000)
committerMario <zacjardine@y7mail.com>
Sun, 27 Aug 2017 19:20:22 +0000 (19:20 +0000)
commitd57bab388e5510670ec30721a10b0b14ff0519ca
tree0344ba30f596626ee4fbe239be1a73ff434ad5f2
parentc8590ef997cead612e4b09ee96bdd66d472ff906
parente6dd8763ecf934f55f4f835e3a587b6fa590f646
Merge branch 'martin-t/okc' into 'master'

Overkill casual step 1

See merge request !464