Blender Git Commit Log

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