diff options
author | Robert Adams | 2012-03-23 16:20:53 -0700 |
---|---|---|
committer | Robert Adams | 2012-03-23 16:20:53 -0700 |
commit | 07388071d4a665e2bc0875ac7416dc25042add75 (patch) | |
tree | 0c6a4ef5e8ea5f49aad4b27ddfae87d21784a114 /OpenSim/Framework/CnmSynchronizedCache.cs | |
parent | BulletSim: change default of shouldDisableContactPoolDynamicAllocation from F... (diff) | |
parent | BulletSim: remove confusion between angularVelocity and rotationalVelocity (t... (diff) | |
download | opensim-SC-07388071d4a665e2bc0875ac7416dc25042add75.zip opensim-SC-07388071d4a665e2bc0875ac7416dc25042add75.tar.gz opensim-SC-07388071d4a665e2bc0875ac7416dc25042add75.tar.bz2 opensim-SC-07388071d4a665e2bc0875ac7416dc25042add75.tar.xz |
Merge branch 'bulletsim1' of ssh://island.sciencesim.com/home/sceneapi/radams1/bs-opensim into bulletsim1
Conflicts:
OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
Diffstat (limited to 'OpenSim/Framework/CnmSynchronizedCache.cs')
0 files changed, 0 insertions, 0 deletions