Emil Axelsson 1197b702d1 Fix compilation error from merge

2017-08-15 16:34:11 +02:00

..

base

Feature/cmake cleanup (#381)

2017-08-14 09:38:32 -04:00

debugging

Rename NewHorizons module to SpacecraftInstruments

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

fieldlines

Feature/cmake cleanup (#381)

2017-08-14 09:38:32 -04:00

galaxy

Feature/cmake cleanup (#381)

2017-08-14 09:38:32 -04:00

globebrowsing

Fix compilation error from merge

2017-08-15 16:34:11 +02:00

imgui

Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management

2017-08-15 11:43:18 +02:00

iswa

Feature/cmake cleanup (#381)

2017-08-14 09:38:32 -04:00

kameleon

Feature/cmake cleanup (#381)

2017-08-14 09:38:32 -04:00

kameleonvolume

Feature/cmake cleanup (#381)

2017-08-14 09:38:32 -04:00

multiresvolume

Feature/cmake cleanup (#381)

2017-08-14 09:38:32 -04:00

space

Feature/cmake cleanup (#381)

2017-08-14 09:38:32 -04:00

spacecraftinstruments

Fix coding style issues

2017-08-14 13:49:13 -04:00

sync

Merge branch 'feature/data-management' of github.com:OpenSpace/OpenSpace into feature/data-management

2017-08-15 11:34:54 +02:00

touch

Feature/cmake cleanup (#381)

2017-08-14 09:38:32 -04:00

toyvolume

Feature/cmake cleanup (#381)

2017-08-14 09:38:32 -04:00

volume

Feature/cmake cleanup (#381)

2017-08-14 09:38:32 -04:00