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

2017-10-16 11:07:24 +02:00

..

ext/imgui

Feature/cmake cleanup (#381)

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

include

Fix compile error in GlobeBrowsing module without GDAL (closes #396)

2017-09-30 15:47:11 -06:00

shaders

Feature/cmake cleanup (#381)

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

src

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

2017-10-16 11:07:24 +02:00

CMakeLists.txt

Feature/gb gui (#390)

2017-08-19 20:23:08 -04:00

imguimodule.cpp

Work on asset management

2017-09-18 12:56:55 +02:00

imguimodule.h

Fix coding style issues

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

include.cmake

Feature/cmake cleanup (#381)

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