Blender Git Loki
Git Commits -> Revision 33fb541
Revision 33fb541 by Bastien Montagne (soc-2014-shapekey) October 21, 2014, 10:13 (GMT) |
Merge branch 'master' into soc-2014-shapekey Conflicts: source/blender/blenkernel/BKE_key.h source/blender/blenkernel/intern/key.c |
Commit Details:
Full Hash: 33fb541e329cd48932be3377f0cc6793e850e0f6
Parent Commits: 00ff9da, 1628ab6