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

Merge branch 'master' into gpu_revamp
---

0f4ee280d2463eaf75d87a1ab7c0bf962bdd3913