svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r21899:21908
authorCampbell Barton <ideasman42@gmail.com>
Sat, 25 Jul 2009 23:16:45 +0000 (23:16 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 25 Jul 2009 23:16:45 +0000 (23:16 +0000)
1  2 
source/gameengine/Converter/BL_BlenderDataConversion.cpp
source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
source/gameengine/Ketsji/KX_GameObject.cpp
source/gameengine/Ketsji/KX_GameObject.h
source/gameengine/Ketsji/KX_MeshProxy.cpp
source/gameengine/Ketsji/KX_MeshProxy.h