From: Dale Weiler <killfieldengine@gmail.com>
Date: Sat, 28 Apr 2012 10:32:32 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/ast-and-ir' into ast-and-ir
X-Git-Tag: 0.1-rc1~567
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=261e47d9b40200b4b01f2efe44c834b93a454afd;p=xonotic%2Fgmqcc.git

Merge remote-tracking branch 'origin/ast-and-ir' into ast-and-ir
---

261e47d9b40200b4b01f2efe44c834b93a454afd