diff options
| author | Melanie | 2012-10-07 02:48:28 +0100 |
|---|---|---|
| committer | Melanie | 2012-10-07 02:48:28 +0100 |
| commit | f7df68d922758c0a78664abe82d631579f6aa63f (patch) | |
| tree | 85daa41ff4b35653b4fbb987cbc852ad853decef /OpenSim/Capabilities | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | refactor: Rename UserSessioNID -> UserSession in WebStatsModule since this is... (diff) | |
| download | opensim-SC-f7df68d922758c0a78664abe82d631579f6aa63f.zip opensim-SC-f7df68d922758c0a78664abe82d631579f6aa63f.tar.gz opensim-SC-f7df68d922758c0a78664abe82d631579f6aa63f.tar.bz2 opensim-SC-f7df68d922758c0a78664abe82d631579f6aa63f.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions