From: Dale Weiler <weilercdale@gmail.com>
Date: Thu, 10 May 2018 01:19:39 +0000 (-0400)
Subject: Merge branch 'master' of github.com:graphitemaster/gmqcc
X-Git-Tag: xonotic-v0.8.5~20
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=commitdiff_plain;h=c74fabffda68fb97716afe9d70744a071f717795;hp=-c

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

c74fabffda68fb97716afe9d70744a071f717795