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

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

Conflicts:
	shader/basicTexture_VS.hlsl
	shader/lightingTexture_FS.hlsl
---

cd2ec1b86f43f8305cf549e95e1a9c7435de64de