From: Dale Weiler <killfieldengine@gmail.com>
Date: Thu, 7 Jun 2012 15:24:55 +0000 (-0400)
Subject: Merge branch 'irgen'
X-Git-Tag: 0.1-rc1~485
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=04cf1d549f7602b7b9521b12355204d3e8fd1249;p=xonotic%2Fgmqcc.git

Merge branch 'irgen'
---

04cf1d549f7602b7b9521b12355204d3e8fd1249