diff options
| author | Melanie | 2011-10-11 21:21:44 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-11 21:21:44 +0100 |
| commit | cc1fe354d01f68add960944ea9ac3cd2feba4c7d (patch) | |
| tree | e56f163d2ced85420137a811701c153c43f6a5e3 /bin/defaultstripe.png | |
| parent | Merge commit 'a4cc5f628f053ad1f9f849addf79551cd58e9337' into bigmerge (diff) | |
| parent | refactor: rename SOG/SOP.GetProperties() to SendPropertiesToClient() to refle... (diff) | |
| download | opensim-SC-cc1fe354d01f68add960944ea9ac3cd2feba4c7d.zip opensim-SC-cc1fe354d01f68add960944ea9ac3cd2feba4c7d.tar.gz opensim-SC-cc1fe354d01f68add960944ea9ac3cd2feba4c7d.tar.bz2 opensim-SC-cc1fe354d01f68add960944ea9ac3cd2feba4c7d.tar.xz | |
Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
Diffstat (limited to 'bin/defaultstripe.png')
0 files changed, 0 insertions, 0 deletions