diff options
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Framework/Watchdog.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/AssemblyResolver.cs')
0 files changed, 0 insertions, 0 deletions
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |