Alexander Bock d3f7139f5e Merge branch 'feature/globebrowsing' into syncing ...

Conflicts:
	modules/globebrowsing/tile/tileprovider/temporaltileprovider.cpp
	openspace.cfg
	src/engine/openspaceengine.cpp
	src/interaction/interactionhandler.cpp

2016-09-20 14:48:28 +02:00

..

cachingtileprovider.cpp

Clean up in tile providers

2016-09-14 12:11:10 -04:00

cachingtileprovider.h

Clean up in tile providers

2016-09-14 12:11:10 -04:00

singleimageprovider.cpp

Add doxygen for grid and cleanup.

2016-09-14 13:46:47 -04:00

singleimageprovider.h

Add doxygen for grid and cleanup.

2016-09-14 13:46:47 -04:00

temporaltileprovider.cpp

Merge branch 'feature/globebrowsing' into syncing

2016-09-20 14:48:28 +02:00

temporaltileprovider.h

Replace start and end time in TemporalTileProvider with TimeRange

2016-09-14 19:26:45 -04:00

texttileprovider.cpp

Merge globebrowsing, resolve conflicts

2016-09-07 17:37:27 -04:00

texttileprovider.h

Add Doxygen comments for TextTileProviders

2016-09-14 19:35:55 -04:00

tileprovider.cpp

Update error message in TileProvider::createFromDictionary.

2016-09-14 14:01:42 -04:00

tileprovider.h

Clean up in tile providers

2016-09-14 12:11:10 -04:00