svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22625:22668
authorCampbell Barton <ideasman42@gmail.com>
Fri, 21 Aug 2009 03:09:27 +0000 (03:09 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 21 Aug 2009 03:09:27 +0000 (03:09 +0000)
commit5cd51b4387f262fbc2b5de18e9f4b9d02f5d4ca6
tree7bb2ea306f00b9030f31e5e38740b03479a10cc1
parent1be67b60fd08f640b56db23e08ad0469318f26b3
parent442ba39d49d9453f84791989c9149692b70ddad5
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22625:22668

needed this for 2.5 testing
source/gameengine/Converter/BL_BlenderDataConversion.cpp
source/gameengine/Converter/KX_BlenderSceneConverter.cpp