Merged revision(s) 58859-58993 from trunk/blender into soc-2013-dingto.
authorThomas Dinges <blender@dingto.org>
Wed, 7 Aug 2013 16:57:18 +0000 (16:57 +0000)
committerThomas Dinges <blender@dingto.org>
Wed, 7 Aug 2013 16:57:18 +0000 (16:57 +0000)
commite4f9cc32ec278605440c2770d293cc872083ee89
treee20c1c4af670cbbefaa466559f8a550f5556c3ef
parent52e91d7da264d7b75ab3b993e7a27fda67d25213
parentbfb63ab5a5de0ac0371d66c64fc83e7dac24f8c9
Merged revision(s) 58859-58993 from trunk/blender into soc-2013-dingto.
intern/cycles/kernel/kernel_types.h