diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
Diffstat (limited to 'bin/OpenSim.Region.ClientStack.LindenCaps.Tests.dll.config')
0 files changed, 0 insertions, 0 deletions