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

..

ext

Update submodules

2020-09-04 13:47:26 +02:00

CMakeLists.txt

Update SGCT repository

2020-08-10 15:58:59 +02:00

include.cmake

Feature/cmake cleanup (#381)

2017-08-14 09:38:32 -04:00

main.cpp

Merge branch 'master' into feature/general-performance

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

openspace.icns

Update OpenSpace application icon

2018-01-12 23:22:52 +01:00

openspace.ico

Update OpenSpace application icon

2018-01-12 23:22:52 +01:00

openspace.png

Update OpenSpace application icon

2018-01-12 23:22:52 +01:00

openspace.rc

Added an icon to the OpenSpace executable

2015-07-17 14:03:38 +02:00