svn merge -r 16351:16368 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorDaniel Genrich <daniel.genrich@gmx.net>
Thu, 4 Sep 2008 23:33:19 +0000 (23:33 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Thu, 4 Sep 2008 23:33:19 +0000 (23:33 +0000)
commitdd03596bfed0aaedaeaa9fecd35fdb061cafe3f4
tree78b997d11873fb45c2e6d4a13015d2f561770563
parent2d50ead6b8ae689b34c8e1a6bd9f57f414f6cef8
parentcb89decfdcf5e6b2f26376d416633f4ccf0c532d
svn merge -r 16351:16368 https://svn.blender.org/svnroot/bf-blender/trunk/blender
source/gameengine/Converter/KX_BlenderSceneConverter.cpp
source/gameengine/Physics/Bullet/CcdPhysicsController.cpp