Michael Nilsson cdbe0ae1e0 solve merge conflict

2016-06-13 15:45:28 -04:00

..

dataprocessor.cpp

Faster processing in DataProcessorText

2016-06-13 13:20:00 -04:00

dataprocessor.h

Every datacygnet uses own dimensions

2016-06-10 15:19:32 -04:00

dataprocessorjson.cpp

Every datacygnet uses own dimensions

2016-06-10 15:19:32 -04:00

dataprocessorjson.h

Every datacygnet uses own dimensions

2016-06-10 15:19:32 -04:00

dataprocessorkameleon.cpp

Every datacygnet uses own dimensions

2016-06-10 15:19:32 -04:00

dataprocessorkameleon.h

Every datacygnet uses own dimensions

2016-06-10 15:19:32 -04:00

dataprocessortext.cpp

Do not process x,y,z variables in DataProcessorText

2016-06-13 14:17:34 -04:00

dataprocessortext.h

Every datacygnet uses own dimensions

2016-06-10 15:19:32 -04:00

iswamanager_lua.inl

Load cdf files at start up

2016-05-24 14:42:38 -04:00

iswamanager.cpp

download texture resource ahead of time

2016-06-13 15:44:31 -04:00

iswamanager.h

solve merge conflict

2016-06-13 15:45:28 -04:00