From: fincs <fincs.alt1@gmail.com>
Date: Fri, 6 Mar 2015 15:32:13 +0000 (+0100)
Subject: Merge branch 'master' into gpu_revamp
X-Git-Tag: v0.5.0~4^2~4
X-Git-Url: https://chaos.moe/g/?a=commitdiff_plain;h=0eed263bba158f41e7af28b78c9081625ead8975;p=corbenik%2Fctrulib.git

Merge branch 'master' into gpu_revamp
---

0eed263bba158f41e7af28b78c9081625ead8975