From: Mario <zacjardine@y7mail.com>
Date: Mon, 7 Aug 2017 05:23:18 +0000 (+0000)
Subject: Merge branch 'martin-t/defaults' into 'master'
X-Git-Tag: xonotic-v0.8.5~2535
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=80591bb9b8da20213b38d3651b094d15cf902dbe;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'martin-t/defaults' into 'master'

Split defaultXonotic to server and client

See merge request !459
---

80591bb9b8da20213b38d3651b094d15cf902dbe