Alexander Bock d628c1a667 Merge branch 'master' into feature/DU ...

# Conflicts:
#	data/scene/grids/grids.mod
#	ext/sgct

2017-10-17 17:09:37 -04:00

..

fonts

Fix for mission visualization

2017-10-16 16:27:32 -04:00

scene

Merge branch 'master' into feature/DU

2017-10-17 17:09:37 -04:00

spice

changes from PR comments

2017-07-13 20:10:35 -06:00

tasks

Some minor cleanup

2017-03-05 20:08:24 -05:00

web

Fix keybindings and properties documentation

2017-09-01 10:50:18 -04:00

cdflist.json

windows fix

2016-05-25 14:06:15 -04:00

cdflist.txt

Load cdf files at start up

2016-05-24 14:42:38 -04:00

globebrowsing_servers.lua

Feature/gb gui (#390)

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

ionosphere_variables.json

Ionosphere test data

2016-05-13 15:22:50 -04:00

test2.jpg

Position, scale and texturepath properties

2016-03-10 15:04:44 -05:00

test3.jpg

Position, scale and texturepath properties

2016-03-10 15:04:44 -05:00