diff options
| author | Melanie | 2013-01-16 01:11:20 +0000 |
|---|---|---|
| committer | Melanie | 2013-01-16 01:11:20 +0000 |
| commit | fc5711fa7ab3bcd0d81737735d098f070a7132bb (patch) | |
| tree | 06fbc4ebf2a4788f4ffd65010d6abadfb2ffafae /OpenSim/Capabilities/Handlers/Properties | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | BulletSim: disable center-of-mass computation for linksets until debugged. Mo... (diff) | |
| download | opensim-SC-fc5711fa7ab3bcd0d81737735d098f070a7132bb.zip opensim-SC-fc5711fa7ab3bcd0d81737735d098f070a7132bb.tar.gz opensim-SC-fc5711fa7ab3bcd0d81737735d098f070a7132bb.tar.bz2 opensim-SC-fc5711fa7ab3bcd0d81737735d098f070a7132bb.tar.xz | |
Merge commit '8bf0a9f85dda4b1831630b65620d5c6868196c11' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
Diffstat (limited to 'OpenSim/Capabilities/Handlers/Properties')
0 files changed, 0 insertions, 0 deletions