From: LockedLunatic <locked.lunatic@aon.at>
Date: Sat, 9 May 2015 21:39:01 +0000 (+0200)
Subject: Merge branch 'master' of git-cgue@lva.cg.tuwien.ac.at:Weave
X-Git-Url: https://git.leopard-lacewing.eu/?a=commitdiff_plain;h=3dd07ee4b66d821ed5489eca68486102b462539a;p=cgue_weave.git

Merge branch 'master' of git-cgue@lva.cg.tuwien.ac.at:Weave

Conflicts:
	shader/basicTexture_VS.hlsl
---

3dd07ee4b66d821ed5489eca68486102b462539a