From: LockedLunatic <locked.lunatic@aon.at>
Date: Sat, 9 May 2015 21:33:30 +0000 (+0200)
Subject: Merge branch 'master' into Lighting
X-Git-Url: https://git.leopard-lacewing.eu/?a=commitdiff_plain;h=e6afd3147d1dacff7decbcf425bf3af983fdd519;p=cgue_weave.git

Merge branch 'master' into Lighting

Conflicts:
	shader/basicTexture_VS.hlsl
---

e6afd3147d1dacff7decbcf425bf3af983fdd519