svn merge -r39877:39878 https://svn.blender.org/svnroot/bf-blender/trunk/blender...
authorCampbell Barton <ideasman42@gmail.com>
Sat, 3 Sep 2011 12:39:17 +0000 (12:39 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 3 Sep 2011 12:39:17 +0000 (12:39 +0000)
commit5c22d9f916ae8ec4a2df2aee23fa962739ecdebc
tree799da6f2d302835f56f03e7258f4862d6cc7f9ad
parent8e232af37c34740928b6be3b08a236310a78fa6f
parent2fb2075c5b3495fede6980b4f9247f9e89c39d39
svn merge -r39877:39878 https://svn.blender.org/svnroot/bf-blender/trunk/blender, merged manually
release/scripts/modules/bpy_types.py
source/blender/bmesh/operators/mesh_conv.c
source/blender/editors/object/object_hook.c
source/blender/editors/object/object_relations.c