]> git.leopard-lacewing.eu Git - cgue_weave.git/commitdiff
projects / cgue_weave.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5acd5a4 5b765d2)
Merge branch 'master' of lva.cg.tuwien.ac.at:Weave
authorPeter Schaefer <schaeferpm@gmail.com>
Fri, 24 Jun 2016 02:58:52 +0000 (04:58 +0200)
committerPeter Schaefer <schaeferpm@gmail.com>
Fri, 24 Jun 2016 02:58:52 +0000 (04:58 +0200)
# Conflicts:
# Weave/Scene/Scene.cpp

1  2 
Weave/Scene/SceneObject.cpp patch | diff1 | diff2 | blob | history

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