Michael Nilsson 3a80405c30 solve merge conflict

2016-05-04 12:10:49 -04:00

..

engine

solve merge conflict with develop

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

interaction

untabify to make merge easier

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

network

untabify to make merge easier

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

properties

Remove cygnet groups

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

query

Updated copyright header

2016-02-05 17:43:21 +01:00

rendering

Set attributes of screenspacerenderable through dictionary

2016-05-03 15:35:33 -04:00

scene

untabify to make merge easier

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

scripting

untabify to make merge easier

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

util

untabify to make merge easier

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

openspace.h

Replacing CMake-based version setting with C++-based version

2016-04-14 10:27:59 -04:00