Merge branch 'martin-t/example-config' into 'master'
authorMario <zacjardine@y7mail.com>
Wed, 7 Mar 2018 08:26:35 +0000 (08:26 +0000)
committerMario <zacjardine@y7mail.com>
Wed, 7 Mar 2018 08:26:35 +0000 (08:26 +0000)
commitcf5382f782b4b43adf2cf1a22bff4eb1af5f086c
treed636821c9e4c94a012b451218d5ff5b2b5ba2f81
parent398e5df70cd2b267accdd8d761b65afb7fdfb2ea
parent1a0ff870ff6b234747a81dd669d18d463e802cb9
Merge branch 'martin-t/example-config' into 'master'

Example config changes

See merge request xonotic/xonotic!35