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

..

syncs

Work on asset loader and synchronization module

2017-07-21 15:36:09 +02:00

CMakeLists.txt

Work on asset loader and synchronization module

2017-07-21 15:36:09 +02:00

include.cmake

Add stub for sync module

2017-07-20 17:07:39 +02:00

syncmodule.cpp

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

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

syncmodule.h

Compile fixes after merge

2017-08-15 11:25:52 +02:00