diff options
Merge branch 'master' into 0.6.7-post-fixes
Conflicts:
OpenSim/Framework/Servers/VersionInfo.cs
Diffstat (limited to 'OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IExtension.cs')
0 files changed, 0 insertions, 0 deletions