Commit: 227ac014a5986ca765fa17317b548aebd802e151
Author: Bastien Montagne
Date: Fri Jan 9 19:42:51 2015 +0100
Branches: mesh-transfer-data
https://developer.blender.org/rB227ac014a5986ca765fa17317b548aebd802e151
Merge branch 'master' into mesh-transfer-data
Conflicts:
source/blender/editors/object/object_data_transfer.c
===================================================================
===================================================================
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs