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

..

cache

Add description to PropertyOwner

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

chunk

Removing more warnings

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

ext/gdal

Update GDAL version to 2.2.0

2017-06-08 12:30:16 -04:00

gdal_data

Update GDAL version to 2.2.0

2017-06-08 12:30:16 -04:00

geometry

Fix byte order mark commits

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

globes

Add description to PropertyOwner

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

meshes

Jenkins compile fix

2017-07-18 18:27:30 -04:00

other

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

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

rendering

Add description to PropertyOwner

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

scripts

Add description to PropertyOwner

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

shaders

Remove const qualifier from shaders as it causes shaders to not compile on Mac

2017-08-03 12:05:58 -04:00

tile

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

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

CMakeLists.txt

Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/core-threadpool

2017-07-21 11:25:42 +02:00

globebrowsingmodule_lua.inl

Fix byte order mark commits

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

globebrowsingmodule.cpp

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

2017-08-14 11:17:25 +02:00

globebrowsingmodule.h

Removing more warnings

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

include.cmake

Make Globebrowsing a default module (closes #324)

2017-06-09 11:33:07 -04:00