Alexander Bock acdfefe46d Merge branch 'master' into feature/loadingscreen-refactor ...

# Conflicts:
#	modules/base/rendering/renderabletrailorbit.h
#	modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
#	modules/digitaluniverse/rendering/renderableplanescloud.cpp
#	modules/digitaluniverse/rendering/renderablepoints.cpp
#	modules/galaxy/rendering/renderablegalaxy.cpp
#	modules/galaxy/rendering/renderablegalaxy.h
#	modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
#	modules/kameleonvolume/rendering/renderablekameleonvolume.h
#	modules/spacecraftinstruments/rendering/renderablefov.h
#	modules/spacecraftinstruments/rendering/renderableplaneprojection.h
#	modules/toyvolume/rendering/renderabletoyvolume.cpp
#	modules/toyvolume/rendering/renderabletoyvolume.h
#	modules/volume/rendering/renderabletimevaryingvolume.cpp
#	modules/volume/rendering/renderabletimevaryingvolume.h

2017-11-08 19:10:59 -06:00

..

cloc

…

cmake

Fix CMake configuration regarding application settings

2017-10-23 13:01:45 -07:00

coding

Merge branch 'master' into feature/loadingscreen-refactor

2017-11-08 19:10:59 -06:00

cppcheck

Removing more CppCheck warnings

2016-07-28 20:31:53 +02:00

doxygen

…

jenkins

Add dependency calculation to the buildAllModuleCombination Jenkins script (closing #116)

2016-08-01 14:34:36 +02:00

joss

Fixing up YAML affiliations

2017-07-26 12:20:54 -04:00

mission

Add node helper script for generating mission file from spice kernels

2016-08-23 12:47:41 -04:00

run

Add optional params -size and -cols for run_multiple_nodes script

2016-09-03 23:33:00 -04:00

server

Add server request script used for the DownloadManager

2016-09-07 16:32:19 +02:00