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

..

include

Tiny cleanup (const is good)

2020-08-25 11:04:14 +02:00

src

Merge branch 'master' into feature/general-performance

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

CMakeLists.txt

Clean-up: Include delta time steps in time topic

2020-08-25 08:55:30 +02:00

include.cmake

Feature/thesis work merge (#566)

2018-03-20 09:30:59 +01:00

servermodule.cpp

update submodules

2020-08-20 14:52:27 +02:00

servermodule.h

Update the copyright header to 2020

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