Michael Nilsson 3a80405c30 solve merge conflict

2016-05-04 12:10:49 -04:00

..

fonts

Add files from the previous data submodule

2016-02-21 01:52:48 +01:00

scene

solve merge conflict

2016-05-04 12:10:49 -04:00

spice

Clean up and multiple transferfunction

2016-04-29 09:56:02 -04:00

test2.jpg

Position, scale and texturepath properties

2016-03-10 15:04:44 -05:00

test3.jpg

Position, scale and texturepath properties

2016-03-10 15:04:44 -05:00