]> git.leopard-lacewing.eu Git - cgue_weave.git/commit
Merge branch 'master' of git-cgue@lva.cg.tuwien.ac.at:Weave
authorLockedLunatic <locked.lunatic@aon.at>
Sat, 9 May 2015 21:39:01 +0000 (23:39 +0200)
committerLockedLunatic <locked.lunatic@aon.at>
Sat, 9 May 2015 21:39:01 +0000 (23:39 +0200)
commit3dd07ee4b66d821ed5489eca68486102b462539a
tree35d991e16d021cc8fd9be287193e3e67b1c69b1d
parente6afd3147d1dacff7decbcf425bf3af983fdd519
parentc0f64112211bf30dd5bce70c97f39bdf02385041
Merge branch 'master' of git-cgue@lva.cg.tuwien.ac.at:Weave

Conflicts:
shader/basicTexture_VS.hlsl