Blender Git Loki
Git Commits -> Revision 683cef0
Revision 683cef0 by Sergey Sharybin (cycles_kernel_split) May 9, 2015, 14:58 (GMT) |
Merge branch 'master' into cycles_kernel_split Conflicts: intern/cycles/device/device.h intern/cycles/kernel/kernel_types.h |
Commit Details:
Full Hash: 683cef0374d4b23b9b6a461da877954ace5078b0
Parent Commits: 2840a5d, e609f5e