Michael Nilsson ba57bd4cf8 solve merge conflict

2016-03-31 09:50:50 -04:00

..

engine

downloadmanager load to string. update texture function to renderabletextureplane

2016-03-23 16:57:25 -04:00

interaction

Updated copyright header

2016-02-05 17:43:21 +01: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

Merge branch 'feature/screenspaceimage' of github.com:OpenSpace/OpenSpace-Development into feature/screenspaceimage

2016-03-30 09:52:01 -04:00

scene

Volume rendering compatible with abuffer and framebuffer renderers

2016-03-21 16:40:24 +01:00

scripting

Removing Jenkins warnings

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

util

Volume rendering compatible with abuffer and framebuffer renderers

2016-03-21 16:40:24 +01:00