From: TimePath <andrew.hardaker1995@gmail.com>
Date: Sun, 14 Aug 2016 10:23:50 +0000 (+0000)
Subject: Merge branch 'Mario/gametypes' into 'master'
X-Git-Tag: xonotic-v0.8.2~718
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4e8161e24083a26a1cf6e427f0f15d13555c2ef3;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/gametypes' into 'master'

Merge branch Mario/gametypes (L merge request)

Moves a bunch of gametype specific code into methods, out of the main code.

See merge request !349
---

4e8161e24083a26a1cf6e427f0f15d13555c2ef3