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)
commit4a113cab0aa4cae3b2a0a59cc5057852c5b5437d
tree3d32154e9e8df2b9251a7d2f71594cf931a89c4b
parent63f1e253c360dcb550bc4b492ccdf0bebf3afa22
parentc15b13f78f359728a2b458126a907ff1a1b80365
Merged revision(s) 57768-57827 from trunk/blender into soc-2013-dingto
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