diff options
Merge branch 'master' into 0.6.7-post-fixes
Conflicts:
OpenSim/Framework/Servers/VersionInfo.cs
Diffstat (limited to 'bin/OpenSim.Framework.Communications.Tests.dll.config')
0 files changed, 0 insertions, 0 deletions
index : opensim-SC_OLD | ||
My fork of OpenSim for IG and MG, called SledjChisl. |
aboutsummaryrefslogtreecommitdiffstatshomepage |