Emil Axelsson 4cdae984e9 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management

2017-09-11 11:52:31 +02:00

..

documentation

Feature/cmake cleanup (#381)

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

engine

Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management

2017-09-11 11:52:31 +02:00

interaction

Fix duplicate property name error

2017-08-14 15:24:41 -04:00

mission

Fix byte order mark commits

2017-07-17 15:54:00 -04:00

network

Feature/cmake cleanup (#381)

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

performance

Feature/cmake cleanup (#381)

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

properties

Feature/cmake cleanup (#381)

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

query

Fix byte order mark commits

2017-07-17 15:54:00 -04:00

rendering

Update gitignore to include Mars texture

2017-08-30 14:56:02 -04:00

scene

Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management

2017-08-15 11:43:18 +02:00

scripting

Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management

2017-08-15 11:43:18 +02:00

util

Add missing file

2017-08-15 12:03:25 +02:00