Michael Nilsson 57cd5c0bf7 solve merge conflict

2016-05-03 15:14:31 -04:00

..

engine

removed iswamanager update function and create cygnet through scripts instead

2016-05-03 15:07:22 -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

untabify to make merge easier

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

query

Removed iswacontainer

2016-05-03 13:46:02 -04:00

rendering

add script to remove screenspacerenderables from renderengine

2016-05-03 13:30:22 -04:00

scene

removed iswamanager update function and create cygnet through scripts instead

2016-05-03 15:07:22 -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

CMakeLists.txt

solve merge conflict with develop

2016-04-20 15:03:51 -04:00

openspace.cpp

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

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