Blender Git Loki
Git Commits -> Revision bc2055e
April 28, 2015, 14:44 (GMT) |
Merge branch 'master' into gooseberry Conflicts: intern/cycles/blender/blender_object.cpp intern/cycles/blender/blender_sync.h source/blender/editors/interface/interface_utils.c |
Commit Details:
Full Hash: bc2055e7b75162453d7e68fdc5ffdf3d4c328ff1
Parent Commits: 55ad6a9, f8c3834