]> git.leopard-lacewing.eu Git - cgue_weave.git/commitdiff
projects / cgue_weave.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6593b7c 5c5a550)
Merge branch 'master' of lva.cg.tuwien.ac.at:Weave
authorPeter Schaefer <schaeferpm@gmail.com>
Tue, 28 Jun 2016 04:09:15 +0000 (06:09 +0200)
committerPeter Schaefer <schaeferpm@gmail.com>
Tue, 28 Jun 2016 04:09:15 +0000 (06:09 +0200)
1  2 
Weave/Scene/Marvin.cpp patch | diff1 | diff2 | blob | history

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