diff options
| author | Melanie | 2013-03-26 03:26:02 +0000 |
|---|---|---|
| committer | Melanie | 2013-03-26 03:26:02 +0000 |
| commit | 95d0a7d4faffd94199f49e2bd0d658d2d8333189 (patch) | |
| tree | 639471bf99034d3209ca6b8496668d9e0fbdbe84 /OpenSim/Tools/pCampBot/Bot.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | BulletSim: new algorithm for vertical attraction which uses quaternion (diff) | |
| download | opensim-SC_OLD-95d0a7d4faffd94199f49e2bd0d658d2d8333189.zip opensim-SC_OLD-95d0a7d4faffd94199f49e2bd0d658d2d8333189.tar.gz opensim-SC_OLD-95d0a7d4faffd94199f49e2bd0d658d2d8333189.tar.bz2 opensim-SC_OLD-95d0a7d4faffd94199f49e2bd0d658d2d8333189.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
Diffstat (limited to 'OpenSim/Tools/pCampBot/Bot.cs')
0 files changed, 0 insertions, 0 deletions