Alexander Bock f227767492 Merge remote-tracking branch 'origin/master' into feature/loadingscreen-refactor ...

# Conflicts:
#	modules/volume/rendering/renderabletimevaryingvolume.cpp

2017-11-12 10:50:11 -05:00

..

defaulttileprovider.cpp

More coding style conformance

2017-11-11 11:25:49 -05:00

defaulttileprovider.h

Add strict test for whitespace at end of line

2017-11-09 23:47:51 -05:00

projectiontileprovider.h

Cleanup for coding style

2017-11-08 10:35:39 -06:00

singleimageprovider.cpp

Cleanup for coding style

2017-11-08 10:35:39 -06:00

singleimageprovider.h

Fix byte order mark commits

2017-07-17 15:54:00 -04:00

sizereferencetileprovider.cpp

More coding style conformance

2017-11-11 11:25:49 -05:00

sizereferencetileprovider.h

Cleanup for coding style

2017-11-08 10:35:39 -06:00

temporaltileprovider.cpp

Merge remote-tracking branch 'origin/master' into feature/loadingscreen-refactor

2017-11-12 10:50:11 -05:00

temporaltileprovider.h

Merge remote-tracking branch 'origin/master' into feature/loadingscreen-refactor

2017-11-12 10:50:11 -05:00

texttileprovider.cpp

Merge branch 'master' into feature/loadingscreen-refactor

2017-11-08 19:10:59 -06:00

texttileprovider.h

Merge branch 'master' into feature/loadingscreen-refactor

2017-11-09 22:49:07 -06:00

tileindextileprovider.cpp

Tiles now have the same size even if padding is enabled.

2017-08-08 16:11:16 +02:00

tileindextileprovider.h

Cleanup for coding style

2017-11-08 10:35:39 -06:00

tileprovider.cpp

Merge branch 'master' into feature/loadingscreen-refactor

2017-11-09 22:49:07 -06:00

tileprovider.h

Add strict test for whitespace at end of line

2017-11-09 23:47:51 -05:00

tileproviderbyindex.cpp

Cleanup for coding style

2017-11-08 10:35:39 -06:00

tileproviderbyindex.h

More coding style conformance

2017-11-11 11:25:49 -05:00

tileproviderbylevel.cpp

Merge remote-tracking branch 'origin/master' into feature/loadingscreen-refactor

2017-11-12 10:50:11 -05:00

tileproviderbylevel.h

Move OpenGL in globebrowsing from constructors into initialization functions

2017-11-03 16:25:06 -04:00