Emma Broman 7e34e1b1d8 Resolve merge conflict

2020-10-12 09:30:51 +02:00

..

documentation

Making the documentation generation a bit more performant

2020-08-21 14:10:33 +02:00

engine

Reintroduce second update function (closes #1296)

2020-10-09 19:26:26 +02:00

interaction

Merge pull request #1302 from OpenSpace/issue/1285

2020-10-12 08:35:36 +02:00

mission

Update the copyright header to 2020

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

network

Coding style cleanup

2020-02-14 19:37:06 +01:00

properties

Making the documentation generation a bit more performant

2020-08-21 14:10:33 +02:00

query

Update the copyright header to 2020

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

rendering

Missing commit

2020-09-04 16:19:39 +02:00

scene

Update GLFW to 3.03

2020-10-10 16:29:12 +02:00

scripting

General code cleanup

2020-04-14 15:48:58 +02:00

util

Resolve merge conflict

2020-10-12 09:30:51 +02:00

CMakeLists.txt

Resolve merge conflict

2020-10-12 09:30:51 +02:00

openspace.cpp

Cleanup of more copyright headers

2020-02-13 14:59:13 +01:00