Alexander Bock fb58aac2d4 Merge remote-tracking branch 'origin/master' into issue/997 ...

# Conflicts:
#	data/assets/scene/solarsystem/planets/mercury/mercury.asset

2020-07-31 15:02:30 +02:00

..

globebrowsing.asset

Merge remote-tracking branch 'origin/master' into issue/997

2020-07-31 15:02:30 +02:00

gui.asset

Feature/gui for touch (#967)

2019-09-18 23:49:51 +02:00

localbookmarks.csv

update local and fix openspace

2020-01-26 12:24:43 -05:00