Merge branch 'master' of lva.cg.tuwien.ac.at:Weave

author Peter Schaefer <schaeferpm@gmail.com>

Fri, 17 Jun 2016 10:33:05 +0000 (12:33 +0200)

committer Peter Schaefer <schaeferpm@gmail.com>

Fri, 17 Jun 2016 10:33:05 +0000 (12:33 +0200)
author Peter Schaefer <schaeferpm@gmail.com>
Fri, 17 Jun 2016 10:33:05 +0000 (12:33 +0200)
committer Peter Schaefer <schaeferpm@gmail.com>
Fri, 17 Jun 2016 10:33:05 +0000 (12:33 +0200)
diff --cc Weave/Game.cpp
Simple merge
diff --cc Weave/Graphix/Model/Model.cpp
Simple merge
diff --cc Weave/Graphix/Model/Model.h
Simple merge
diff --cc Weave/Scene/Scene.cpp
Simple merge
diff --cc Weave/Scene/SceneObject.cpp
Simple merge
diff --cc Weave/Scene/SceneObject.h
Simple merge
author	Peter Schaefer <schaeferpm@gmail.com>
	Fri, 17 Jun 2016 10:33:05 +0000 (12:33 +0200)
committer	Peter Schaefer <schaeferpm@gmail.com>
	Fri, 17 Jun 2016 10:33:05 +0000 (12:33 +0200)
		1	2
Weave/Game.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
Weave/Graphix/Model/Model.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
Weave/Graphix/Model/Model.h	patch \|	diff1 \|	diff2 \|	blob \| history
Weave/Scene/Scene.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
Weave/Scene/SceneObject.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
Weave/Scene/SceneObject.h	patch \|	diff1 \|	diff2 \|	blob \| history