Michael Nilsson 583663db22 solve merge conflict

2016-06-29 16:52:48 -04:00

..

engine

actually fix thread blocking issue + changeRange fix in Histogram + unused function cleanup

2016-06-29 16:52:04 -04:00

interaction

Moved stop function from header

2016-06-28 15:08:57 -04:00

network

untabify to make merge easier

2016-04-20 15:21:30 -04:00

performance

Make performance widget graphs fill from right to left instead of circular

2016-06-07 11:16:27 +02:00

properties

Fix linking error in ScalarProperty with wchar_t

2016-06-17 11:28:32 +02:00

query

Name changes

2016-05-09 13:09:47 -04:00

rendering

Merge remote-tracking branch 'origin/feature/iSWA' into release/ips

2016-06-17 11:31:33 +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 merge conflict

2016-06-29 16:52:48 -04:00

openspace.h

Updating versioning number to prerelease-9 (IPS)

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