diff options
| author | Melanie | 2012-04-07 04:52:14 +0100 |
|---|---|---|
| committer | Melanie | 2012-04-07 04:52:14 +0100 |
| commit | b39de2425cac4c2a94a7fdd6c77100ef831d66b4 (patch) | |
| tree | 9258928681a82d68b408354e534c32bcf283ad3a /OpenSim/Data/Null/NullSimulationData.cs | |
| parent | Merge branch 'ubitwork' (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-b39de2425cac4c2a94a7fdd6c77100ef831d66b4.zip opensim-SC_OLD-b39de2425cac4c2a94a7fdd6c77100ef831d66b4.tar.gz opensim-SC_OLD-b39de2425cac4c2a94a7fdd6c77100ef831d66b4.tar.bz2 opensim-SC_OLD-b39de2425cac4c2a94a7fdd6c77100ef831d66b4.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/CoreModules/World/Land/LandObject.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Data/Null/NullSimulationData.cs')
0 files changed, 0 insertions, 0 deletions