Alexander Bock 88cf7926ae Merge branch 'master' into feature/loadingscreen-refactor ...

# Conflicts:
#	modules/galaxy/rendering/renderablegalaxy.cpp

2017-11-09 10:51:56 -05:00

..

rendering

Merge branch 'master' into feature/loadingscreen-refactor

2017-11-09 10:51:56 -05:00

scripts

Rename NewHorizons module to SpacecraftInstruments

2017-08-14 13:27:47 -04:00

shaders

Fix meridian shift issue on Pluto

2017-08-21 13:53:05 -04:00

util

More coding style fixes

2017-11-08 21:36:06 -06:00

CMakeLists.txt

Rename NewHorizons module to SpacecraftInstruments

2017-08-14 13:27:47 -04:00

include.cmake

Rename NewHorizons module to SpacecraftInstruments

2017-08-14 13:27:47 -04:00

spacecraftinstrumentsmodule.cpp

Rename NewHorizons module to SpacecraftInstruments

2017-08-14 13:27:47 -04:00

spacecraftinstrumentsmodule.h

Cleanup for coding style

2017-11-08 10:35:39 -06:00