From: fincs <fincs.alt1@gmail.com>
Date: Mon, 2 Mar 2015 16:03:58 +0000 (+0100)
Subject: Merge branch 'master' into gpu_revamp
X-Git-Tag: v0.5.0~4^2~5
X-Git-Url: https://chaos.moe/g/?a=commitdiff_plain;h=54473e54871ec44d22eefab2a8a7655b0244b0e6;p=corbenik%2Fctrulib.git

Merge branch 'master' into gpu_revamp
---

54473e54871ec44d22eefab2a8a7655b0244b0e6