Alexander Bock b78d1dd033 Merge branch 'master' into feature/memory-allocations ...

# Conflicts:
#	include/openspace/scene/scenegraphnode.h
#	modules/imgui/include/gui.h

2020-08-05 19:06:04 +02:00

..

ext/imgui

Update the copyright header to 2020

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

include

Merge branch 'master' into feature/memory-allocations

2020-08-05 19:06:04 +02:00

shaders

Update the copyright header to 2020

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

src

Merge branch 'master' into feature/memory-allocations

2020-08-05 19:06:04 +02:00

CMakeLists.txt

Merge branch 'master' into feature/memory-allocations

2020-08-05 19:06:04 +02:00

imguimodule.cpp

Remove performance measurements that have been supersceded by using Tracy

2020-08-05 18:28:08 +02:00

imguimodule.h

Cleaning up window delegate

2020-05-10 15:17:51 +02:00

include.cmake

Feature/cmake cleanup (#381)

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