Alexander Bock 2ebacb6f93 Merge branch 'master' into thesis/2018/dsn ...

# Conflicts:
#	ext/ghoul

2018-12-03 18:10:28 -05:00

..

blockplaneintersectiongeometry.h

Code cleanup branch (#618)

2018-06-10 04:47:34 +00:00

boxgeometry.h

Code cleanup branch (#618)

2018-06-10 04:47:34 +00:00

camera.h

Code cleanup branch (#618)

2018-06-10 04:47:34 +00:00

concurrentjobmanager.h

Code cleanup branch (#618)

2018-06-10 04:47:34 +00:00

concurrentjobmanager.inl

Code cleanup branch (#618)

2018-06-10 04:47:34 +00:00

concurrentqueue.h

Code cleanup branch (#618)

2018-06-10 04:47:34 +00:00

concurrentqueue.inl

Code cleanup branch (#618)

2018-06-10 04:47:34 +00:00

distanceconstants.h

Update copyright header

2017-12-29 20:11:22 +01:00

distanceconversion.h

Feature/gaia mission merge (#766)

2018-11-20 18:19:08 -05:00

factorymanager.h

Code cleanup branch (#618)

2018-06-10 04:47:34 +00:00

factorymanager.inl

Code cleanup branch (#618)

2018-06-10 04:47:34 +00:00

histogram.h

Code cleanup branch (#618)

2018-06-10 04:47:34 +00:00

httprequest.h

Remove Clang warnings

2018-09-25 12:23:55 -04:00

job.h

Feature/globebrowsing speedup (#735)

2018-10-30 17:20:06 -04:00

keys.h

Feature/minvr (#744)

2018-10-29 22:10:35 -04:00

mouse.h

Code cleanup branch (#618)

2018-06-10 04:47:34 +00:00

openspacemodule.h

Add support for checking of OpenGL extensions to provide better error messages

2018-06-26 11:51:21 -04:00

powerscaledcoordinate.h

Code cleanup branch (#618)

2018-06-10 04:47:34 +00:00

powerscaledscalar.h

Code cleanup branch (#618)

2018-06-10 04:47:34 +00:00

powerscaledsphere.h

Code cleanup branch (#618)

2018-06-10 04:47:34 +00:00

progressbar.h

Code cleanup branch (#618)

2018-06-10 04:47:34 +00:00

resourcesynchronization.h

Linux compile fix

2018-06-21 14:46:28 -04:00

screenlog.h

Code cleanup branch (#618)

2018-06-10 04:47:34 +00:00

spicemanager.h

added ra dec to cartesian helper function in spicemanager

2018-11-09 12:30:01 -05:00

syncable.h

Code cleanup branch (#618)

2018-06-10 04:47:34 +00:00

syncbuffer.h

Feature/minvr (#744)

2018-10-29 22:10:35 -04:00

syncbuffer.inl

Code cleanup branch (#618)

2018-06-10 04:47:34 +00:00

syncdata.h

Feature/time interpolation (#669)

2018-07-13 11:07:35 +02:00

syncdata.inl

Feature/time interpolation (#669)

2018-07-13 11:07:35 +02:00

synchronizationwatcher.h

Code cleanup branch (#618)

2018-06-10 04:47:34 +00:00

task.h

Code cleanup branch (#618)

2018-06-10 04:47:34 +00:00

taskloader.h

Code cleanup branch (#618)

2018-06-10 04:47:34 +00:00

threadpool.h

Code cleanup branch (#618)

2018-06-10 04:47:34 +00:00

time.h

Feature/time interpolation (#669)

2018-07-13 11:07:35 +02:00

timeconversion.h

Code cleanup branch (#618)

2018-06-10 04:47:34 +00:00

timeline.h

Code cleanup branch (#618)

2018-06-10 04:47:34 +00:00

timeline.inl

Code cleanup branch (#618)

2018-06-10 04:47:34 +00:00

timemanager.h

Feature/webgui ops (#723)

2018-11-05 20:45:38 -05:00

timerange.h

Code cleanup branch (#618)

2018-06-10 04:47:34 +00:00

transformationmanager.h

Adapt to removal of Singleton

2018-11-05 14:17:42 -05:00

updatestructures.h

Feature/time interpolation (#669)

2018-07-13 11:07:35 +02:00