aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
diff options
context:
space:
mode:
authorMelanie2012-06-06 13:07:05 +0100
committerMelanie2012-06-06 13:07:05 +0100
commite733fb32cf76672cfddc25b3c9c02c50c025e2db (patch)
tree1535c9e7d70cdb5f2e0779db8fc85fb98ede7ca5 /OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
parentMerge branch 'master' into careminster (diff)
parentminor: Change log messages on Warp3DImageModule to show they are from this mo... (diff)
downloadopensim-SC-e733fb32cf76672cfddc25b3c9c02c50c025e2db.zip
opensim-SC-e733fb32cf76672cfddc25b3c9c02c50c025e2db.tar.gz
opensim-SC-e733fb32cf76672cfddc25b3c9c02c50c025e2db.tar.bz2
opensim-SC-e733fb32cf76672cfddc25b3c9c02c50c025e2db.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-12-24 05:37:27 +0000