Merged revision(s) 57587-57670 from trunk/blender into soc-2013-dingto
authorThomas Dinges <blender@dingto.org>
Sun, 23 Jun 2013 18:04:13 +0000 (18:04 +0000)
committerThomas Dinges <blender@dingto.org>
Sun, 23 Jun 2013 18:04:13 +0000 (18:04 +0000)
1  2 
intern/cycles/device/device_cuda.cpp
intern/cycles/kernel/CMakeLists.txt
intern/cycles/kernel/kernel_types.h
intern/cycles/render/nodes.cpp

Simple merge
Simple merge
Simple merge
Simple merge