aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs
diff options
context:
space:
mode:
authorMelanie2012-10-07 02:48:28 +0100
committerMelanie2012-10-07 02:48:28 +0100
commitf7df68d922758c0a78664abe82d631579f6aa63f (patch)
tree85daa41ff4b35653b4fbb987cbc852ad853decef /OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs
parentMerge branch 'master' into careminster (diff)
parentrefactor: Rename UserSessioNID -> UserSession in WebStatsModule since this is... (diff)
downloadopensim-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 'OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-12-27 00:12:37 +0000