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

Conflicts:
	include/openspace/scene/scenegraphnode.h
	src/engine/openspaceengine.cpp
	src/interaction/interactionhandler.cpp
	src/interaction/interactionmode.cpp

2017-07-18 10:54:41 +02:00

..

Launcher

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

2017-07-18 10:54:41 +02:00

OpenSpace

Automatically set SGCT_SPOUT_SUPPORT when OPENSPACE_SPOUT_SUPPORT is set

2017-07-13 13:42:23 -04:00

TaskRunner

Update branch to work with changes in develop

2017-03-02 18:53:03 +01:00

TimelineView

Feature/packaging (#333)

2017-07-01 14:04:37 -04:00