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

..

rendering

Update Ghoul repository

2017-03-03 10:55:20 -05:00

rotation

- Some cleanup of LuaConsole

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

shaders

…

translation

…

CMakeLists.txt

…

include.cmake

…

spacemodule.cpp

…

spacemodule.h

Jenkins compilation fix

2017-03-02 18:50:11 +01:00