Blender Git Loki
Git Commits -> Revision a84309e
Revision a84309e by Jeroen Bakker (blender-tiles) July 1, 2014, 16:27 (GMT) |
Merge remote-tracking branch 'blender-upstream/master' into blender-tiles Conflicts: source/blender/compositor/intern/COM_MemoryBuffer.cpp source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp source/blender/compositor/operations/COM_KeyingClipOperation.cpp source/blender/compositor/operations/COM_RenderLayersProg.cpp |
Commit Details:
Full Hash: a84309e894c787ecfc36003f93167270cc1680ad
Parent Commits: 1cb5c28, 6c6fa74