]> git.leopard-lacewing.eu Git - cgue_weave.git/commitdiff
projects / cgue_weave.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d68f2f7 58915c4)
Merge branch 'Lighting' of git-cgue@lva.cg.tuwien.ac.at:Weave
authorLockedLunatic <locked.lunatic@aon.at>
Sat, 9 May 2015 23:17:06 +0000 (01:17 +0200)
committerLockedLunatic <locked.lunatic@aon.at>
Sat, 9 May 2015 23:17:06 +0000 (01:17 +0200)
Conflicts:
shader/basicTexture_VS.hlsl
shader/lightingTexture_FS.hlsl


Trivial merge
CGUE Weave Projekt