From: Dale Weiler <killfieldengine@gmail.com>
Date: Sun, 29 Apr 2012 20:39:43 +0000 (-0400)
Subject: Merge branch 'master' into ast-and-ir
X-Git-Tag: 0.1-rc1~548
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8c91adeb9ff922ec0fa957405d5839b4478f7832;p=xonotic%2Fgmqcc.git

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

8c91adeb9ff922ec0fa957405d5839b4478f7832