aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSim.cs
diff options
context:
space:
mode:
authorMelanie2013-11-03 21:34:36 +0000
committerMelanie2013-11-03 21:34:36 +0000
commitba203ed94fb9fb27e4da2663dad6cac21d5892e3 (patch)
treec03981fa7b9070af3cec331234b78762c49a8a06 /OpenSim/Region/Application/OpenSim.cs
parentMerge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff)
parentAdd current .NET windows framework requirement to README. (diff)
downloadopensim-SC-ba203ed94fb9fb27e4da2663dad6cac21d5892e3.zip
opensim-SC-ba203ed94fb9fb27e4da2663dad6cac21d5892e3.tar.gz
opensim-SC-ba203ed94fb9fb27e4da2663dad6cac21d5892e3.tar.bz2
opensim-SC-ba203ed94fb9fb27e4da2663dad6cac21d5892e3.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/Application/OpenSim.cs')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-11-18 18:37:30 +0000