diff options
| author | Melanie | 2012-09-27 17:29:44 +0100 |
|---|---|---|
| committer | Melanie | 2012-09-27 17:29:44 +0100 |
| commit | 001ec0e2e6f8c426af8f4a1c1eb9be4db066aea4 (patch) | |
| tree | 11170fddbd0f4c71c6f8288b5848442dfdc90d76 /OpenSim/Region/Physics/BulletSPlugin | |
| parent | Remove a core undo call that we don't need. (diff) | |
| parent | Merge branch 'ubitwork' into avination (diff) | |
| download | opensim-SC-001ec0e2e6f8c426af8f4a1c1eb9be4db066aea4.zip opensim-SC-001ec0e2e6f8c426af8f4a1c1eb9be4db066aea4.tar.gz opensim-SC-001ec0e2e6f8c426af8f4a1c1eb9be4db066aea4.tar.bz2 opensim-SC-001ec0e2e6f8c426af8f4a1c1eb9be4db066aea4.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions