diff options
| author | Melanie | 2013-05-24 01:11:49 +0100 |
|---|---|---|
| committer | Melanie | 2013-05-24 01:11:49 +0100 |
| commit | e2e839a0cd4035ffacfcdc601dfc534a05bc4e0f (patch) | |
| tree | 1c9b02e48835c85a84b85d690428bf65adfe7fd9 /OpenSim/Server/Handlers/Grid/GridServerConnector.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | minor: Remove unnecessary duplication of AbsolutePosition Vector3 in SOG.Copy() (diff) | |
| download | opensim-SC-e2e839a0cd4035ffacfcdc601dfc534a05bc4e0f.zip opensim-SC-e2e839a0cd4035ffacfcdc601dfc534a05bc4e0f.tar.gz opensim-SC-e2e839a0cd4035ffacfcdc601dfc534a05bc4e0f.tar.bz2 opensim-SC-e2e839a0cd4035ffacfcdc601dfc534a05bc4e0f.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
Diffstat (limited to 'OpenSim/Server/Handlers/Grid/GridServerConnector.cs')
0 files changed, 0 insertions, 0 deletions