diff options
| author | Andre Susano Pinto <andresusanopinto@gmail.com> | 2008-09-19 18:15:36 +0400 |
|---|---|---|
| committer | Andre Susano Pinto <andresusanopinto@gmail.com> | 2008-09-19 18:15:36 +0400 |
| commit | 656ee61718d85f9366115756ba28e4b53f36d6b2 (patch) | |
| tree | cca1c89160ea2facf62675bfd9313a0c6a052d30 /extern/bullet2/Makefile | |
| parent | 2f9f0710d140466f3b8030b66f4637b7f12b9d4a (diff) | |
Merge from trunk
(The last time there was some files missing due to failed connection to svn server while merging.. thats why this stuff of reverting last merge and redoing it)
svn merge -r 16231:16608 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'extern/bullet2/Makefile')
| -rw-r--r-- | extern/bullet2/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/extern/bullet2/Makefile b/extern/bullet2/Makefile index e05d441a6be..d26289c8b01 100644 --- a/extern/bullet2/Makefile +++ b/extern/bullet2/Makefile @@ -40,7 +40,8 @@ BulletCollision/NarrowPhaseCollision \ BulletCollision//CollisionDispatch \ BulletDynamics/ConstraintSolver \ BulletDynamics/Vehicle \ -BulletDynamics/Dynamics +BulletDynamics/Dynamics \ +BulletSoftBody include nan_subdirs.mk |