Commit: d8674d32ecc423c9bc4371b03f6bdaf93e54ecd6
Author: Bastien Montagne
Date: Fri Jan 9 13:06:34 2015 +0100
Branches: mesh-transfer-data
https://developer.blender.org/rBd8674d32ecc423c9bc4371b03f6bdaf93e54ecd6
Merge branch 'master' into mesh-transfer-data
Conflicts:
source/blender/blenkernel/BKE_bvhutils.h
source/blender/blenkernel/intern/bvhutils.c
source/blender/blenlib/intern/astar.c
===================================================================
===================================================================
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
