[Bf-blender-cvs] [5fcc889] tiles-scheduler: Merge branch 'blender-tiles' of gitorious.org:blender-tiles/blender-tiles into blender-tiles

[Jeroen Bakker]

Commit: 5fcc889baa03f5b614687f5e7a74c450b98a8f42
Author: Jeroen Bakker
Date:   Mon May 12 20:35:18 2014 +0200
https://developer.blender.org/rB5fcc889baa03f5b614687f5e7a74c450b98a8f42

Merge branch 'blender-tiles' of gitorious.org:blender-tiles/blender-tiles into blender-tiles

Conflicts:
	source/blender/blenlib/BLI_compiler_compat.h
	source/blender/compositor/CMakeLists.txt
	source/blender/compositor/intern/COM_ChannelInfo.h
	source/blender/compositor/intern/COM_ExecutionSystem.cpp
	source/blender/compositor/intern/COM_MemoryBuffer.cpp
	source/blender/compositor/intern/COM_OpenCLDevice.cpp
	source/blender/compositor/nodes/COM_SocketProxyNode.cpp
	source/blender/compositor/operations/COM_CompositorOperation.cpp
	source/blender/compositor/operations/COM_ReadBufferOperation.h
	source/blender/compositor/operations/COM_RenderLayersProg.cpp

===================================================================



===================================================================