Alexander Bock 00a00c9cc8 Merge branch 'master' into feature/general-performance ...

# Conflicts:
#	apps/OpenSpace/main.cpp
#	modules/server/src/topics/timetopic.cpp

2020-09-04 13:49:00 +02:00

..

dashboard

Merge branch 'master' into feature/general-performance

2020-09-04 13:49:00 +02:00

rendering

Use global memory block for the models

2020-08-19 10:27:21 +02:00

scripts

…

shaders

Mixed cleanup

2020-07-10 11:25:26 +02:00

util

Next step towards enabling a managed memory version of templatefactory

2020-08-04 21:56:39 +02:00

CMakeLists.txt

Update the copyright header to 2020

2020-02-10 21:51:01 +01:00

include.cmake

Feature/cef speedup (#806)

2019-04-24 10:53:46 +02:00

spacecraftinstrumentsmodule.cpp

Update the copyright header to 2020

2020-02-10 21:51:01 +01:00

spacecraftinstrumentsmodule.h

Update the copyright header to 2020

2020-02-10 21:51:01 +01:00