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

Changing interaction handler to have a default inverted roll

2016-04-30 13:16:41 +02:00

network

Untabify more files

2016-04-27 14:24:58 +02:00

properties

Remove cygnet groups

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

query

Removed iswacontainer

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

rendering

solve merge conflict

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

scene

solve merge conflict with develop

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

scripting

Untabify more files

2016-04-27 14:24:58 +02:00

util

Update default Qt version to 5.6

2016-04-30 10:24:49 +02: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