]> git.leopard-lacewing.eu Git - cgue_weave.git/commitdiff
projects / cgue_weave.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0b5a7ac 8e39880)
Merge branch 'master' of lva.cg.tuwien.ac.at:Weave
authorPeter Schaefer <schaeferpm@gmail.com>
Fri, 20 May 2016 15:47:58 +0000 (17:47 +0200)
committerPeter Schaefer <schaeferpm@gmail.com>
Fri, 20 May 2016 15:47:58 +0000 (17:47 +0200)
1  2 
Weave/Scene/Scene.cpp patch | diff1 | diff2 | blob | history
Weave/Scene/Scene.h patch | diff1 | diff2 | blob | history

diff --cc Weave/Scene/Scene.cpp
Simple merge
diff --cc Weave/Scene/Scene.h
Simple merge
CGUE Weave Projekt