Michael Nilsson 07dfafeddb solve merge conflict with develop

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

..

engine

solve merge conflict with develop

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

interaction

Enable the usage of modifiers in bindKey calls (closing #158)

2016-04-08 18:03:09 +02:00

network

Updated copyright header

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

properties

Update ghoul to account for removed boost dependency

2016-03-15 23:59:57 +01:00

query

Updated copyright header

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

rendering

solve merge conflict with develop

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

scene

Put ISWACygnets in sceneGraph

2016-04-08 15:42:24 -04:00

scripting

Removing Jenkins warnings

2016-02-05 23:28:45 +01:00

util

Remove sgct.h inclusion from LuaConsole

2016-04-18 11:12:12 +02:00

openspace.h

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

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