svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22205:22290
authorCampbell Barton <ideasman42@gmail.com>
Fri, 7 Aug 2009 04:41:15 +0000 (04:41 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 7 Aug 2009 04:41:15 +0000 (04:41 +0000)
commitbc093b4cc485757cd07875a9b5576cbb2567696f
treea054ba0c70f2645845a261d4fe9b899f8b36986e
parent77d79ffb5d1c4d214f2aa8decfe8e5a53138369a
parente7c53e20a18573e05970beb93184fc32b88c98c9
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22205:22290
source/blender/blenkernel/BKE_library.h
source/blender/blenkernel/intern/library.c
source/gameengine/Converter/BL_BlenderDataConversion.cpp
source/gameengine/Converter/KX_BlenderSceneConverter.cpp
source/gameengine/Converter/KX_BlenderSceneConverter.h
source/gameengine/Expressions/PyObjectPlus.cpp
source/gameengine/Ketsji/KX_Scene.cpp