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

..

blockplaneintersectiongeometry.h

Add a style check that checks whether the correct GLM header is used

2017-02-14 13:12:59 -05:00

boxgeometry.h

Add a style check that checks whether the correct GLM header is used

2017-02-14 13:12:59 -05:00

camera.h

Merge branch 'develop' of github.com:OpenSpace/OpenSpace into pr/scenegraph-refactor

2017-03-07 10:57:50 +01:00

concurrentjobmanager.h

Move GlobeBrowsing thread pool to OpenSpace core

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

concurrentjobmanager.inl

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

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

concurrentqueue.h

Move GlobeBrowsing thread pool to OpenSpace core

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

concurrentqueue.inl

Move GlobeBrowsing thread pool to OpenSpace core

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

distanceconstants.h

Change tabs to spaces

2017-04-17 15:00:15 -04:00

factorymanager.h

Rename Documented to DocumentationGenerator

2017-05-11 18:16:30 -04:00

factorymanager.inl

Add checks for inline files in style checker

2017-03-01 21:17:12 -05:00

gpudata.h

Feature/globebrowsing optimization (#310)

2017-05-30 15:37:05 +02:00

histogram.h

Remove warnings on MacOS in Clang

2017-04-25 19:12:42 -04:00

keys.h

- Some cleanup of LuaConsole

2017-03-02 14:27:18 -05:00

mouse.h

Update copyright header to 2017

2017-02-06 18:02:01 -05:00

openspacemodule.h

Some cleanup of ModuleEngine

2017-03-02 17:24:44 -05:00

powerscaledcoordinate.h

Fix byte order mark commits

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

powerscaledscalar.h

Fix byte order mark commits

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

powerscaledsphere.h

Fix byte order mark commits

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

progressbar.h

Update copyright header to 2017

2017-02-06 18:02:01 -05:00

screenlog.h

Missing Destructors: Issue #307 (#308)

2017-05-18 10:13:20 +02:00

spicemanager.h

Cleanup of RenderableCrawlingLine

2017-03-12 16:05:14 -04:00

syncbuffer.h

Update copyright header to 2017

2017-02-06 18:02:01 -05:00

syncdata.h

Fix byte order mark commits

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

task.h

Some minor cleanup

2017-03-05 20:08:24 -05:00

taskloader.h

Some minor cleanup

2017-03-05 20:08:24 -05:00

threadpool.h

Move GlobeBrowsing thread pool to OpenSpace core

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

time.h

Fix byte order mark commits

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

timeline.h

Remove warnings

2017-06-08 00:07:51 -04:00

timeline.inl

feature/time-refactor (#294)

2017-05-22 14:01:08 +02:00

timemanager.h

feature/time-refactor (#294)

2017-05-22 14:01:08 +02:00

timerange.h

Fix byte order mark commits

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

transformationmanager.h

Removing more warnings

2017-07-18 01:05:59 -04:00

updatestructures.h

Fix byte order mark commits

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