Michael Nilsson 2b541127fa Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA

2016-05-09 11:24:33 -04:00

..

base

removee displaying propery owner name from gui properties

2016-05-06 17:21:48 -04:00

fieldlines

fix fieldlines modules shaders

2016-04-27 14:47:06 -04:00

iswa

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

2016-05-09 11:24:33 -04:00

kameleon

Colormaps and read image format from string

2016-04-27 14:44:07 -04:00

multiresvolume

untabify to make merge easier

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

newhorizons

solve merge conflict with develop

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

onscreengui

removee displaying propery owner name from gui properties

2016-05-06 17:21:48 -04:00

toyvolume

untabify to make merge easier

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

volume

untabify to make merge easier

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