From: Wolfgang (Blub) Bumiller <blub@speed.at>
Date: Thu, 26 Apr 2012 08:13:07 +0000 (+0200)
Subject: Merge branch 'master' into blub/ast-and-ir-merging
X-Git-Tag: 0.1-rc1~594
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=234567cb9fd0d1dc32d50202b10ab7ce75d31f09;p=xonotic%2Fgmqcc.git

Merge branch 'master' into blub/ast-and-ir-merging
-> Todo: take over bool from qbool
---

234567cb9fd0d1dc32d50202b10ab7ce75d31f09