Alexander Bock 341bc8b105 Merge branch 'develop' into feature/globebrowsing ...

# Conflicts:
#	modules/globebrowsing/chunk/chunkrenderer.cpp
#	modules/globebrowsing/globes/renderableglobe.cpp
#	modules/globebrowsing/globes/renderableglobe.h

2016-12-03 01:32:23 +01:00

..

earth.data

New textures for earth with atmosphere.

2016-06-09 09:18:08 -04:00

earth.mod

Merge branch 'develop' into feature/globebrowsing

2016-12-03 01:32:23 +01:00