diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'bin/lib/NET/Mono.Security.dll')
-rw-r--r-- | bin/lib/NET/Mono.Security.dll | bin | 0 -> 282624 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/bin/lib/NET/Mono.Security.dll b/bin/lib/NET/Mono.Security.dll new file mode 100644 index 0000000..6accde7 --- /dev/null +++ b/bin/lib/NET/Mono.Security.dll | |||
Binary files differ | |||