diff options
| author | Melanie | 2013-11-03 21:34:36 +0000 |
|---|---|---|
| committer | Melanie | 2013-11-03 21:34:36 +0000 |
| commit | ba203ed94fb9fb27e4da2663dad6cac21d5892e3 (patch) | |
| tree | c03981fa7b9070af3cec331234b78762c49a8a06 /ThirdPartyLicenses | |
| parent | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff) | |
| parent | Add current .NET windows framework requirement to README. (diff) | |
| download | opensim-SC-ba203ed94fb9fb27e4da2663dad6cac21d5892e3.zip opensim-SC-ba203ed94fb9fb27e4da2663dad6cac21d5892e3.tar.gz opensim-SC-ba203ed94fb9fb27e4da2663dad6cac21d5892e3.tar.bz2 opensim-SC-ba203ed94fb9fb27e4da2663dad6cac21d5892e3.tar.xz | |
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 '')
| -rw-r--r-- | ThirdPartyLicenses/CircularBuffer.txt | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/ThirdPartyLicenses/CircularBuffer.txt b/ThirdPartyLicenses/CircularBuffer.txt new file mode 100644 index 0000000..09c37d9 --- /dev/null +++ b/ThirdPartyLicenses/CircularBuffer.txt | |||
| @@ -0,0 +1,16 @@ | |||
| 1 | Copyright (c) 2012, Alex Regueiro | ||
| 2 | All rights reserved. | ||
| 3 | Redistribution and use in source and binary forms, with or without modification, are permitted provided that the | ||
| 4 | following conditions are met: | ||
| 5 | |||
| 6 | Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. | ||
| 7 | Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer | ||
| 8 | in the documentation and/or other materials provided with the distribution. | ||
| 9 | |||
| 10 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, | ||
| 11 | BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | ||
| 12 | IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, | ||
| 13 | OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, | ||
| 14 | OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, | ||
| 15 | OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | ||
| 16 | POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file | ||