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. --- extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.h') diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.h index f98372442ba..b192efeeb8d 100644 --- a/extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.h +++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.h @@ -12,8 +12,8 @@ subject to the following restrictions: 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. */ -#ifndef SPHERE_MINKOWSKI_H -#define SPHERE_MINKOWSKI_H +#ifndef BT_SPHERE_MINKOWSKI_H +#define BT_SPHERE_MINKOWSKI_H #include "btConvexInternalShape.h" #include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types @@ -70,4 +70,4 @@ public: }; -#endif //SPHERE_MINKOWSKI_H +#endif //BT_SPHERE_MINKOWSKI_H -- cgit v1.2.3