Alexander Bock 00e684f7dc Merge remote-tracking branch 'origin/master' into misc/cleanup ...

# Conflicts:
#	data/scene/default.scene
#	modules/globebrowsing/globes/pointglobe.cpp
#	modules/globebrowsing/tile/rawtiledatareader/tiledatatype.cpp

2017-07-15 13:22:46 -04:00

..

base

Various fixes for the New Horizons scene

2017-07-14 18:53:40 -04:00

debugging

Started some warning cleanup

2017-07-14 14:21:01 -04:00

fieldlines

Provide a static member variable Name for all OpenSpaceModules

2017-07-12 13:59:16 -04:00

galaxy

Started some warning cleanup

2017-07-14 14:21:01 -04:00

globebrowsing

Merge remote-tracking branch 'origin/master' into misc/cleanup

2017-07-15 13:22:46 -04:00

iswa

Provide a static member variable Name for all OpenSpaceModules

2017-07-12 13:59:16 -04:00

kameleon

Provide a static member variable Name for all OpenSpaceModules

2017-07-12 13:59:16 -04:00

kameleonvolume

Started some warning cleanup

2017-07-14 14:21:01 -04:00

multiresvolume

Started some warning cleanup

2017-07-14 14:21:01 -04:00

newhorizons

Various fixes for the New Horizons scene

2017-07-14 18:53:40 -04:00

onscreengui

Interaction Updates (#353)

2017-07-14 17:17:17 +02:00

space

Line endings

2017-07-13 11:00:50 -06:00

touch

Started some warning cleanup

2017-07-14 14:21:01 -04:00

toyvolume

Started some warning cleanup

2017-07-14 14:21:01 -04:00

volume

Line endings

2017-07-13 11:00:50 -06:00