Blender Git Loki
Git Commits -> Revision e5a1c2e
Revision e5a1c2e by Bastien Montagne (soc-2014-shapekey) October 10, 2014, 20:09 (GMT) |
Merge branch 'master' into soc-2014-shapekey Conflicts: release/datafiles/blender_icons.svg source/blender/editors/mesh/editmesh_tools.c source/blender/editors/object/object_shapekey.c Note about blender_icons.svg: blindly reset to master state, hard to do otherwise on such file... :/ |
Commit Details:
Full Hash: e5a1c2ef65ebc27939e50386c318e0a61b58e66f
Parent Commits: e74279b, f7957e2