diff options
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'bin/OpenSim.Region.ClientStack.LindenCaps.Tests.dll.config')
0 files changed, 0 insertions, 0 deletions