Emma Broman 7e34e1b1d8 Resolve merge conflict

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

..

documentation

Update the copyright header to 2020

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

engine

Making the documentation generation a bit more performant

2020-08-21 14:10:33 +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

Merge branch 'master' into feature/session-recording-improvements

2020-10-09 22:10:40 +02: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

Merge remote-tracking branch 'origin/master' into feature/openglstatecache

2020-09-04 14:02:17 +02:00

scene

Merge branch 'master' into feature/asset-meta-update

2020-10-10 12:01:56 +02:00

scripting

Merge pull request #1063 from OpenSpace/bug/macosbuild

2020-02-10 23:39:39 +01:00

util

Resolve merge conflict

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

json.h

Update the copyright header to 2020

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