diff options
| author | Melanie | 2011-11-05 11:17:40 +0000 |
|---|---|---|
| committer | Melanie | 2011-11-05 11:17:40 +0000 |
| commit | 03f5bbcaf2a58990b59d573cdde671ae803e2224 (patch) | |
| tree | caa6bad1f5f66f7933be6f6f36013e26fba7a100 /OpenSim/Region/Framework/Interfaces/IEntityInventory.cs | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| parent | add myself to the contributors.txt (diff) | |
| download | opensim-SC_OLD-03f5bbcaf2a58990b59d573cdde671ae803e2224.zip opensim-SC_OLD-03f5bbcaf2a58990b59d573cdde671ae803e2224.tar.gz opensim-SC_OLD-03f5bbcaf2a58990b59d573cdde671ae803e2224.tar.bz2 opensim-SC_OLD-03f5bbcaf2a58990b59d573cdde671ae803e2224.tar.xz | |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces/IEntityInventory.cs')
0 files changed, 0 insertions, 0 deletions