aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/.gitignore
diff options
context:
space:
mode:
authorMelanie2013-03-26 03:26:02 +0000
committerMelanie2013-03-26 03:26:02 +0000
commit95d0a7d4faffd94199f49e2bd0d658d2d8333189 (patch)
tree639471bf99034d3209ca6b8496668d9e0fbdbe84 /.gitignore
parentMerge branch 'master' into careminster (diff)
parentBulletSim: new algorithm for vertical attraction which uses quaternion (diff)
downloadopensim-SC-95d0a7d4faffd94199f49e2bd0d658d2d8333189.zip
opensim-SC-95d0a7d4faffd94199f49e2bd0d658d2d8333189.tar.gz
opensim-SC-95d0a7d4faffd94199f49e2bd0d658d2d8333189.tar.bz2
opensim-SC-95d0a7d4faffd94199f49e2bd0d658d2d8333189.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions