Alexander Bock 50fd9309ba Merge branch 'master' into feature/NewAtmosphere ...

# Conflicts:
#	src/rendering/renderengine.cpp

2017-10-24 15:30:22 -04:00

..

Launcher

Merge branch 'master' into feature/NewAtmosphere

2017-10-20 10:42:18 -04:00

OpenSpace

Remove runTime from OpenSpaceEngine and place in WindowWrapper instead

2017-10-24 01:33:53 -07:00

TaskRunner

Volume conversion and rendering (#350)

2017-09-22 12:03:23 +02:00

TimelineView

Feature/cmake cleanup (#381)

2017-08-14 09:38:32 -04:00