From 82d3d9f2ba47bbf2f868b5a970d1fe149eba13e2 Mon Sep 17 00:00:00 2001 From: Sergej Reich Date: Fri, 8 Jun 2012 16:13:01 +0000 Subject: Update Bullet to version 2.80 (bullet svn revision 2537) Remove Jamfiles and other unused files that stuck around during previous updates. Add patches for local changes to the patches directory. Update readme.txt, it had outdated infromation. --- .../src/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h') diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h index a6da5f61a3c..1d7e74401dd 100644 --- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h +++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h @@ -13,8 +13,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef COLLISION_CREATE_FUNC -#define COLLISION_CREATE_FUNC +#ifndef BT_COLLISION_CREATE_FUNC +#define BT_COLLISION_CREATE_FUNC #include "LinearMath/btAlignedObjectArray.h" class btCollisionAlgorithm; @@ -41,5 +41,5 @@ struct btCollisionAlgorithmCreateFunc return 0; } }; -#endif //COLLISION_CREATE_FUNC +#endif //BT_COLLISION_CREATE_FUNC -- cgit v1.2.3