diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
Diffstat (limited to 'OpenSim/Tests/Common/TestLogging.cs')
0 files changed, 0 insertions, 0 deletions
index : opensim-SC | ||
My fork of OpenSim for IG and DG, called SledjChisl. |
aboutsummaryrefslogtreecommitdiffstatshomepage |