Kalle Bladin 012bcaefaf Solve merge conflicts.

2016-06-07 12:54:52 -04:00

..

engine

Add Lua function to check whether a specific module is loaded (closing #36)

2016-06-04 19:38:56 +02:00

interaction

Solve merge conflict

2016-06-02 12:57:25 -04:00

network

Untabify the rest of the source files

2016-04-18 20:14:29 +02:00

performance

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

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

properties

Remove cygnet groups

2016-05-03 17:13:28 -04:00

query

Name changes

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

rendering

Solve merge conflicts.

2016-06-07 12:54:52 -04:00

scene

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

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

scripting

Untabify the rest of the source files

2016-04-18 20:14:29 +02:00

util

Solve merge conflicts.

2016-06-07 12:54:52 -04:00

openspace.h

Updating versioning number to prerelease-9 (IPS)

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