Cycles: svn merge -r40266:40358 https://svn.blender.org/svnroot/bf-blender/trunk...
[blender.git] / intern / cycles / app /
drwxr-xr-x   ..
-rw-r--r-- 1089 CMakeLists.txt
-rw-r--r-- 1782 cycles_server.cpp
-rw-r--r-- 7840 cycles_test.cpp
-rw-r--r-- 25538 cycles_xml.cpp
-rw-r--r-- 955 cycles_xml.h