]> git.leopard-lacewing.eu Git - cgue_weave.git/commitdiff
projects / cgue_weave.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 362740a a92e90a)
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)
Conflicts:
shader/basicTexture_VS.hlsl

1  2 
shader/lightingTexture_FS.hlsl patch | diff1 | diff2 | blob | history

diff --cc shader/lightingTexture_FS.hlsl
Simple merge
CGUE Weave Projekt