From: Dale Weiler <weilercdale@gmail.com>
Date: Sun, 26 Nov 2017 22:48:13 +0000 (-0500)
Subject: Merge branch 'master' of github.com:graphitemaster/gmqcc
X-Git-Tag: xonotic-v0.8.5~29
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1580c23556fea4089acf86462fdf28c281d93397;p=xonotic%2Fgmqcc.git

Merge branch 'master' of github.com:graphitemaster/gmqcc
---

1580c23556fea4089acf86462fdf28c281d93397