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

Merge branch 'master' into gpu_revamp
---

1b80b69e733f724f89ba034b1af19fb456d23a8a