Alexander Bock d0aaaeb090 Merge remote-tracking branch 'origin/master' into feature/profile-gui ...

# Conflicts:
#	data/profiles/apollo8.profile
#	data/profiles/apollo_sites.profile
#	data/profiles/asteroids.profile
#	data/profiles/dawn.profile
#	data/profiles/default.profile
#	data/profiles/default_full.profile
#	data/profiles/gaia.profile
#	data/profiles/insight.profile
#	data/profiles/juno.profile
#	data/profiles/mars.profile
#	data/profiles/messenger.profile
#	data/profiles/newhorizons.profile
#	data/profiles/osirisrex.profile
#	data/profiles/rosetta.profile
#	data/profiles/touch.profile
#	data/profiles/voyager.profile

2020-10-13 16:32:58 +02:00

..

documentation

Update the copyright header to 2020

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

engine

Rename ProfilesReadOnly -> ReadOnlyProfiles

2020-10-13 16:22:05 +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/profile-gui

2020-10-11 11:18:45 +02:00

scripting

Merge pull request #1063 from OpenSpace/bug/macosbuild

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

util

Merge remote-tracking branch 'origin/master' into feature/profile-gui

2020-10-13 16:32:58 +02:00

json.h

Update the copyright header to 2020

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