svn merge ^/trunk/blender -r49410:49412
[blender.git] / source / blender / opencl / SConscript
2012-05-24 Sergey SharybinMerging r46725 through r46963 from trunk into soc-2011...
2012-05-17 Jeroen Bakker ____