Merged revision(s) 57768-57827 from trunk/blender into soc-2013-dingto
authorThomas Dinges <blender@dingto.org>
Thu, 27 Jun 2013 16:16:54 +0000 (16:16 +0000)
committerThomas Dinges <blender@dingto.org>
Thu, 27 Jun 2013 16:16:54 +0000 (16:16 +0000)
1  2 
intern/cycles/blender/addon/ui.py
intern/cycles/device/device_cuda.cpp
intern/cycles/kernel/shaders/CMakeLists.txt
release/datafiles/startup.blend
release/scripts/startup/nodeitems_builtins.py

Simple merge
Simple merge
index 805308cf6629f2517aa45ab14d2676d204bc4a0d,c604d16829ce6a5106e895002102e33bd2a83707..8b58493fe3a4a1b8e404ee214d1610104aabbab8
Binary files differ