From: Dale Weiler <killfieldengine@gmail.com>
Date: Sat, 28 Apr 2012 20:45:02 +0000 (-0400)
Subject: Merge branch 'master' into ast-and-ir
X-Git-Tag: 0.1-rc1~554
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=commitdiff_plain;h=206952b920856ef53b953d3d477f00869b7191fd;hp=-c

Merge branch 'master' into ast-and-ir
---

206952b920856ef53b953d3d477f00869b7191fd