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)
1  2 
intern/cycles/kernel/kernel_types.h

Simple merge