]> git.leopard-lacewing.eu Git - cgue_weave.git/commit
Merge branch 'master' into Lighting
authorLockedLunatic <locked.lunatic@aon.at>
Sat, 9 May 2015 21:33:30 +0000 (23:33 +0200)
committerLockedLunatic <locked.lunatic@aon.at>
Sat, 9 May 2015 21:33:30 +0000 (23:33 +0200)
commite6afd3147d1dacff7decbcf425bf3af983fdd519
tree3e12faebbbc6a3d224c8fdc97a79a8c33fe33165
parent362740ad55fe63b4766fc4ee8c8ae80fa275fff6
parenta92e90a3f265876e7bacd4bb35dda880952b9965
Merge branch 'master' into Lighting

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