diff options
| author | Melanie | 2013-09-01 22:49:31 +0100 |
|---|---|---|
| committer | Melanie | 2013-09-01 22:49:31 +0100 |
| commit | 008c98a9748ba7deadb80c435ddd372002b6c844 (patch) | |
| tree | 9458b87c1d28d741ee6c2384eb1028375cb703ab /bin/data/LICENSE-README-IMPORTANT.txt | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Profiles: Clean up some log entries caused when visiting HG avatar is using l... (diff) | |
| download | opensim-SC-008c98a9748ba7deadb80c435ddd372002b6c844.zip opensim-SC-008c98a9748ba7deadb80c435ddd372002b6c844.tar.gz opensim-SC-008c98a9748ba7deadb80c435ddd372002b6c844.tar.bz2 opensim-SC-008c98a9748ba7deadb80c435ddd372002b6c844.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/World/Region/RestartModule.cs
OpenSim/Region/Framework/Scenes/SceneGraph.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
Diffstat (limited to 'bin/data/LICENSE-README-IMPORTANT.txt')
| -rw-r--r-- | bin/data/LICENSE-README-IMPORTANT.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/data/LICENSE-README-IMPORTANT.txt b/bin/data/LICENSE-README-IMPORTANT.txt index a1ac20c..dd8671d 100644 --- a/bin/data/LICENSE-README-IMPORTANT.txt +++ b/bin/data/LICENSE-README-IMPORTANT.txt | |||
| @@ -2,4 +2,4 @@ Not all of the files in this directory are licensed under the BSD license. Some | |||
| 2 | 2 | ||
| 3 | These files are: | 3 | These files are: |
| 4 | 4 | ||
| 5 | - avataranimations.xml (Derivative work of viewerart.ini, Creative Commons Attribution+Share-Alike v2.5 License) | 5 | - avataranimations.xml (Derivative work of viewerart.ini, Creative Commons Attribution+Share-Alike v2.5 License) |