Commit: edcc37a12c471f2b7d33ff8279b065b914331cf2
Author: Bastien Montagne
Date: Fri Jan 9 18:36:57 2015 +0100
Branches: mesh-transfer-data
https://developer.blender.org/rBedcc37a12c471f2b7d33ff8279b065b914331cf2
Merge branch 'master' into mesh-transfer-data
Conflicts:
source/blender/blenkernel/BKE_mesh_remap.h
===================================================================
===================================================================
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
