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

Conflicts:
	modules/base/rendering/screenspaceimage.cpp

2016-03-10 15:06:34 -05:00

..

base

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

2016-03-10 15:06:34 -05:00

fieldlines

Fixes for Windows

2016-01-02 21:40:15 +01:00

kameleon

Uncomment old Progressbar from Kameleon to make jenkins compile again

2016-02-05 23:00:12 +01:00

newhorizons

Update Ghoul version to accommodate public API bool parameter changes

2016-03-06 08:08:06 +01:00

onscreengui

Update Ghoul version to accommodate public API bool parameter changes

2016-03-06 08:08:06 +01:00

volume

disable volume module to suppress compilation errors

2016-02-04 10:02:16 +01:00