From: Wolfgang (Blub) Bumiller <blub@speed.at>
Date: Fri, 27 Apr 2012 09:05:57 +0000 (+0200)
Subject: Merge branch 'master' into blub/ast-and-ir-merging
X-Git-Tag: 0.1-rc1~587
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=69173876f11da6ea695f7d518d5036ddcf5179a6;p=xonotic%2Fgmqcc.git

Merge branch 'master' into blub/ast-and-ir-merging
---

69173876f11da6ea695f7d518d5036ddcf5179a6