diff options
Merge branch 'master' into avinationmerge0.9.0
Conflicts:
OpenSim/Framework/AvatarAppearance.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/DotNetEngine.Compiler.LSL/OpenSim.ScriptEngine.DotNetEngine.Compiler.LSL.csproj')
0 files changed, 0 insertions, 0 deletions