mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-01 09:10:18 -06:00
Code Issues Packages Projects Releases Wiki Activity
4,693 Commits 99 Branches 46 Tags
af8bec1441727b1e224978db039ca24f9a7eecb2
Commit Graph

5 Commits

Author SHA1 Message Date
Emil Axelsson
af8bec1441 Prepare for data sync 2017-09-14 20:16:51 +02:00
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
Emil Axelsson
eed7041f1c Compile fixes after merge 2017-08-15 11:25:52 +02:00
Emil Axelsson
9491e920ad Work on asset loader and synchronization module 2017-07-21 15:36:09 +02:00
Emil Axelsson
9c3ca2228a Add stub for sync module 2017-07-20 17:07:39 +02:00