From: TimePath <andrew.hardaker1995@gmail.com>
Date: Sun, 24 Jul 2016 03:58:46 +0000 (+0000)
Subject: Merge branch 'qfusion_updates' into 'master'
X-Git-Tag: xonotic-v0.8.2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c6ffb73b4891ff232ef30fd172a4c4593f514fa5;p=xonotic%2Fnetradiant.git

Merge branch 'qfusion_updates' into 'master'

-game qfusion updates



See merge request !29
---

c6ffb73b4891ff232ef30fd172a4c4593f514fa5