From: Dale Weiler <killfieldengine@gmail.com>
Date: Sat, 28 Apr 2012 08:12:24 +0000 (-0400)
Subject: Merge branch 'assembler' into ast-and-ir
X-Git-Tag: 0.1-rc1~578
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=858d9734a2b41a5c08b709daae30fc4664b45480;p=xonotic%2Fgmqcc.git

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

858d9734a2b41a5c08b709daae30fc4664b45480