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)
needed this for 2.5 testing

1  2 
source/gameengine/Converter/BL_BlenderDataConversion.cpp
source/gameengine/Converter/KX_BlenderSceneConverter.cpp