Emil Axelsson d7cd3a01a5 Merge branch 'develop' of github.com:OpenSpace/OpenSpace into pr/kameleonvolume ...

Conflicts:
	src/engine/openspaceengine.cpp

2017-03-03 18:08:29 +01:00

..

Launcher

Merge pull request #238 from OpenSpace/issue155

2017-02-21 19:48:26 -05:00

OpenSpace

- Some cleanup of LuaConsole

2017-03-02 14:27:18 -05:00

TaskRunner

Update branch to work with changes in develop

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

TimelineView

Updated check_style_guide to test for include guards and copyright

2017-02-09 23:55:39 -05:00