Erik Broberg 3bad4097d1 Resolved conflict

2016-04-01 13:14:26 -04:00

..

base

Added multimodelgeometry.* files to the project and removed wavefrontgeometry.* files from the project.

2016-03-16 09:08:47 -04: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

Merge branch 'develop' into MultiModelFormatReader

2016-03-16 10:44:07 -04:00

onscreengui

Update Ghoul version to accommodate public API bool parameter changes

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

planetbrowsing

Resolved conflict

2016-04-01 13:14:26 -04:00

volume

disable volume module to suppress compilation errors

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