diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Framework/RegionSettings.cs
Diffstat (limited to 'OpenSim/Framework/Location.cs')
0 files changed, 0 insertions, 0 deletions
index : opensim-SC_OLD | ||
My fork of OpenSim for IG and MG, called SledjChisl. |
aboutsummaryrefslogtreecommitdiffstatshomepage |