]> git.leopard-lacewing.eu Git - cgue_weave.git/commitdiff
Merge branch 'master' of lva.cg.tuwien.ac.at:Weave
authorPeter Schaefer <schaeferpm@gmail.com>
Tue, 7 Jun 2016 06:51:38 +0000 (08:51 +0200)
committerPeter Schaefer <schaeferpm@gmail.com>
Tue, 7 Jun 2016 06:51:38 +0000 (08:51 +0200)
1  2 
Weave/Graphix/Textures/Texture.cpp
Weave/Graphix/Textures/Texture.h
Weave/Scene/Scene.cpp

Simple merge
Simple merge
Simple merge