Emil Axelsson 6c36fa7bfd Merge branch 'feature/data-management' of github.com:OpenSpace/OpenSpace into feature/data-management ...

Conflicts:
	include/openspace/util/concurrentjobmanager.h
	include/openspace/util/concurrentjobmanager.inl
	include/openspace/util/concurrentqueue.h
	include/openspace/util/concurrentqueue.inl
	include/openspace/util/threadpool.h
	modules/globebrowsing/tile/tileloadjob.h
	modules/sync/syncmodule.cpp
	src/util/threadpool.cpp

2017-08-15 11:34:54 +02:00

..

rawtiledatareader

Add description to PropertyOwner

2017-08-01 17:05:52 -04:00

tileprovider

Add description to PropertyOwner

2017-08-01 17:05:52 -04:00

asynctiledataprovider.cpp

Fix byte order mark commits

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

asynctiledataprovider.h

Fix byte order mark commits

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

chunktile.h

Fix byte order mark commits

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

pixelregion.cpp

Removing more warnings

2017-07-17 18:03:37 -04:00

pixelregion.h

Fix byte order mark commits

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

quad.h

Feature/globebrowsingcleanup (#230)

2017-02-15 21:20:05 +01:00

rawtile.cpp

Remove warnings

2017-07-26 11:59:48 -04:00

rawtile.h

Fix byte order mark commits

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

textureformat.h

Fix byte order mark commits

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

tile.cpp

Fix byte order mark commits

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

tile.h

Fix byte order mark commits

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

tiledepthtransform.h

Fix byte order mark commits

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

tileindex.cpp

Fix byte order mark commits

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

tileindex.h

Fix byte order mark commits

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

tileloadjob.cpp

Fix byte order mark commits

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

tileloadjob.h

Merge branch 'feature/data-management' of github.com:OpenSpace/OpenSpace into feature/data-management

2017-08-15 11:34:54 +02:00

tilemetadata.cpp

Fix byte order mark commits

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

tilemetadata.h

Fix byte order mark commits

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

tileselector.cpp

Fix byte order mark commits

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

tileselector.h

Fix byte order mark commits

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

tiletextureinitdata.cpp

Fix byte order mark commits

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

tiletextureinitdata.h

Fix byte order mark commits

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

tileuvtransform.h

Fix byte order mark commits

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