Merge branch 'martin-t/defaults' into 'master'
authorMario <zacjardine@y7mail.com>
Mon, 11 Jun 2018 08:55:19 +0000 (08:55 +0000)
committerMario <zacjardine@y7mail.com>
Mon, 11 Jun 2018 08:55:19 +0000 (08:55 +0000)
commitb2e3660c5c919d8be9594934e8f6eec9b82346a3
treeb3d83bf1e7bd16b553922ec956e1cd426c20760d
parent1d42e9d9e3e364e10c3c41b507ab6abd77dd6c9a
parent09001690f4688f5a26c71947283961841d493644
Merge branch 'martin-t/defaults' into 'master'

Changes to defaults

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