Emil Axelsson a71f4974fe Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/planetradius ...

Conflicts:
	modules/space/rendering/simplespheregeometry.h

2017-04-13 21:31:40 +02:00

..

rendering

Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/planetradius

2017-04-13 21:31:40 +02:00

rotation

Compile fix

2017-04-12 16:00:49 -04:00

shaders

Code cleanup

2017-02-27 23:03:07 -05:00

translation

Compile fix

2017-04-12 16:00:49 -04:00

CMakeLists.txt

Code cleanup

2017-02-27 23:03:07 -05:00

include.cmake

Separate base module into base and space

2016-12-13 14:43:44 +01:00

spacemodule.cpp

- Remove documentation.h include and replace with forward declaration

2017-03-01 18:13:15 -05:00

spacemodule.h

Jenkins compilation fix

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