diff options
| author | Melanie | 2013-11-03 21:34:36 +0000 |
|---|---|---|
| committer | Melanie | 2013-11-03 21:34:36 +0000 |
| commit | ba203ed94fb9fb27e4da2663dad6cac21d5892e3 (patch) | |
| tree | c03981fa7b9070af3cec331234b78762c49a8a06 /OpenSim/Services/UserProfilesService | |
| parent | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff) | |
| parent | Add current .NET windows framework requirement to README. (diff) | |
| download | opensim-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/Services/UserProfilesService')
0 files changed, 0 insertions, 0 deletions