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

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

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

..

base

Merge branch 'master' into feature/loadingscreen-refactor

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

debugging

Merge branch 'master' into feature/loadingscreen-refactor

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

digitaluniverse

Merge branch 'master' into feature/loadingscreen-refactor

2017-11-08 19:10:59 -06:00

fieldlines

Merge branch 'master' into feature/loadingscreen-refactor

2017-11-08 19:10:59 -06:00

galaxy

Merge branch 'master' into feature/loadingscreen-refactor

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

globebrowsing

Merge branch 'master' into feature/loadingscreen-refactor

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

imgui

Cleanup for coding style

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

iswa

More coding style fixes

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

kameleon

Cleanup for coding style

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

kameleonvolume

Merge branch 'master' into feature/loadingscreen-refactor

2017-11-08 19:10:59 -06:00

multiresvolume

Merge branch 'master' into feature/loadingscreen-refactor

2017-11-08 19:10:59 -06:00

space

Merge branch 'master' into feature/loadingscreen-refactor

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

spacecraftinstruments

Merge branch 'master' into feature/loadingscreen-refactor

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

touch

Cleanup for coding style

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

toyvolume

Merge branch 'master' into feature/loadingscreen-refactor

2017-11-08 19:10:59 -06:00

volume

Merge branch 'master' into feature/loadingscreen-refactor

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