]> 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>
Mon, 20 Jun 2016 00:03:02 +0000 (02:03 +0200)
committerLockedLunatic <locked.lunatic@aon.at>
Mon, 20 Jun 2016 00:03:02 +0000 (02:03 +0200)
commit92da84575db0b0fb7e526cccb0d2ec0740941087
tree03b5d68bf2d7d44552e46315b409cebdfda3ee96
parentb16fb85192982a63b97a110eeaf0b721d5cd110a
parent4144a53be320af7a76478d53b107e83da36496d7
Merge branch 'master' of git-cgue@lva.cg.tuwien.ac.at:Weave

# Conflicts:
# Weave/Weave.vcxproj.filters
Weave/Game.cpp
Weave/Graphix/Model/Model.cpp
Weave/Graphix/Model/Model.h
Weave/Scene/Scene.cpp
Weave/Scene/SceneObject.cpp
Weave/Scene/SceneObject.h
Weave/Weave.vcxproj