Alexander Bock 4409003524 Merge commit '4ae4ecca3cc69eba5b59e62e19bd52877602fcdd' into develop ...

Conflicts:
	data/scene/default.scene

2016-06-04 19:06:54 +02:00

..

ext

…

rendering

Auto filter at start

2016-06-03 14:16:15 -04:00

shaders

Improved multiple transfer functions

2016-06-02 16:56:25 -04:00

util

Merge commit '4ae4ecca3cc69eba5b59e62e19bd52877602fcdd' into develop

2016-06-04 19:06:54 +02:00

CMakeLists.txt

cleanup, update ghoul ref

2016-06-03 11:32:09 -04:00

include.cmake

…

info

…

iswamodule.cpp

Add KameleonPlanes again

2016-05-18 11:10:04 -04:00

iswamodule.h

…