svn merge -r39831:39877 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Sat, 3 Sep 2011 02:49:21 +0000 (02:49 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 3 Sep 2011 02:49:21 +0000 (02:49 +0000)
commit8e232af37c34740928b6be3b08a236310a78fa6f
tree670e644c241b2be846ebb4b3a50b184e68ff7a28
parentee22fe7bacee9d7089b8a318fb435fe0c449c24f
parent6b4bdf621f2830ceff2c44f871523a312422a338
svn merge -r39831:39877 https://svn.blender.org/svnroot/bf-blender/trunk/blender
source/blender/blenkernel/intern/collision.c
source/blender/blenlib/intern/math_geom.c
source/blender/editors/object/object_bake.c
source/blender/editors/space_view3d/view3d_view.c
source/gameengine/Converter/BL_BlenderDataConversion.cpp