From: smea <smealum@gmail.com>
Date: Wed, 31 Dec 2014 21:34:25 +0000 (-0800)
Subject: Merge branch 'master' into gpu_revamp
X-Git-Tag: v0.5.0~4^2~24
X-Git-Url: https://chaos.moe/g/?a=commitdiff_plain;h=3c4c2a6c04e149f5100cafe1a5db2c89bd9ba356;p=corbenik%2Fctrulib.git

Merge branch 'master' into gpu_revamp
---

3c4c2a6c04e149f5100cafe1a5db2c89bd9ba356