svn merge -r 16608:16749 https://svn.blender.org/svnroot/bf-blender/trunk/blender

SConstruct

extern/bullet2/CMakeLists.txt

extern/bullet2/Makefile

extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj

...c/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h

.../BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp

...rc/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h

...src/BulletCollision/CollisionDispatch/btCollisionObject.h

...Collision/CollisionDispatch/btSimulationIslandManager.cpp

...on/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp

...src/BulletCollision/CollisionShapes/btConvexHullShape.cpp

...2/src/BulletCollision/CollisionShapes/btConvexHullShape.h

...BulletCollision/CollisionShapes/btConvexInternalShape.cpp

...ollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp

...tCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h

...t2/src/BulletCollision/CollisionShapes/btTriangleMesh.cpp

...let2/src/BulletCollision/CollisionShapes/btTriangleMesh.h

extern/bullet2/src/BulletCollision/Gimpact/btBoxCollision.h

extern/bullet2/src/BulletCollision/Gimpact/btClipPolygon.h

...llet2/src/BulletCollision/Gimpact/btContactProcessing.cpp