Michael Nilsson a3f9a84160 solve large merge conflict

2016-06-30 16:03:52 -04:00

..

engine

solve large merge conflict

2016-06-30 16:03:52 -04:00

interaction

solve large merge conflict

2016-06-30 16:03:52 -04:00

network

Include file cleanup

2016-06-27 15:02:21 +02:00

performance

Make PerformanceManager not crash if performance measurements are requested multiple times

2016-06-27 15:02:40 +02:00

properties

Group properties in the Gui based on the group identifier

2016-06-29 19:45:45 +02:00

query

solve large merge conflict

2016-06-30 16:03:52 -04:00

rendering

Add visibility toggle to Property base class

2016-06-28 14:50:53 +02:00

scene

Merge remote-tracking branch 'origin/feature/galaxy' into develop

2016-06-04 19:54:34 +02:00

scripting

Added logging to the script engine and the associated properties in openspace.cfg table. Fixed comment for PropertyDocumentation in scene.cpp

2016-06-16 17:03:48 +02:00

util

solve large merge conflict

2016-06-30 16:03:52 -04:00

openspace.h

Updating versioning number to prerelease-9 (IPS)

2016-05-31 18:26:20 +02:00