diff options
| author | Jeroen Bakker <j.bakker@atmind.nl> | 2014-05-12 22:35:18 +0400 |
|---|---|---|
| committer | Jeroen Bakker <j.bakker@atmind.nl> | 2014-05-12 23:45:43 +0400 |
| commit | 5fcc889baa03f5b614687f5e7a74c450b98a8f42 (patch) | |
| tree | ddc7b215e88441a1741a303c9821aee842ec6455 /release/freedesktop | |
| parent | 3b691b54b1f8edfe666be46f3cb22efe0fa7f2e6 (diff) | |
| parent | 815c99938210a5bf72f8202dcdefd6d11df65c0b (diff) | |
Merge branch 'blender-tiles' of gitorious.org:blender-tiles/blender-tiles into blender-tilestiles-scheduler
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
Diffstat (limited to 'release/freedesktop')
0 files changed, 0 insertions, 0 deletions