Joakim Kilby a3ff828e91 Merge branch 'develop' of openspace.itn.liu.se:/openspace into feature/updateSGCT ...

Conflicts:
	src/engine/openspaceengine.cpp

2015-02-16 08:33:01 +01:00

..

ephemeris.cpp

Replaced RuntimeData with separate, temporary structs that are passed around

2014-09-26 13:29:01 +02:00

scenegraph.cpp

Merge branch 'develop' of openspace.itn.liu.se:/openspace into feature/updateSGCT

2015-02-16 08:33:01 +01:00

scenegraphnode.cpp

commit to be able to merge

2015-02-12 14:58:40 +01:00

spiceephemeris.cpp

Fixed model oriantation

2014-10-21 12:49:39 -04:00

staticephemeris.cpp

Replaced RuntimeData with separate, temporary structs that are passed around

2014-09-26 13:29:01 +02:00