Merged revision(s) 59035-59107 from trunk/blender into soc-2013-dingto.
authorThomas Dinges <blender@dingto.org>
Tue, 13 Aug 2013 09:15:03 +0000 (09:15 +0000)
committerThomas Dinges <blender@dingto.org>
Tue, 13 Aug 2013 09:15:03 +0000 (09:15 +0000)
Skipping 59034 (Non-Progressive on GPU).

1  2 
intern/cycles/device/device_cuda.cpp

Simple merge