Emil Axelsson 2426545a05 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management ...

Conflicts:
	src/rendering/renderengine.cpp
	src/scene/scene.cpp
	src/scene/sceneloader.cpp
	tests/test_concurrentjobmanager.inl
	tests/test_concurrentqueue.inl
	tests/test_sceneloader.inl

2017-08-15 11:43:18 +02:00

5.6 KiB

Raw Blame History

View Raw