svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22875:22935
authorCampbell Barton <ideasman42@gmail.com>
Tue, 1 Sep 2009 18:49:33 +0000 (18:49 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 1 Sep 2009 18:49:33 +0000 (18:49 +0000)
commitf12f23806280df74f7971cca24800ad8dfe750c1
treec9db21f139e871e1528d72c4e7336aa7e00c2859
parent3bc5d87e5001453f05f9f14c0326dc87727982fa
parent959757c2d7bdfe7955e2c645a511ac450a607c47
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22875:22935

Note, missing r22897, schlaile
source/blender/src/hddaudio.c
source/gameengine/Ketsji/KX_GameObject.cpp
source/gameengine/Ketsji/KX_PolyProxy.cpp
source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
source/gameengine/Rasterizer/RAS_MaterialBucket.h
source/gameengine/Rasterizer/RAS_Polygon.h