aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Interfaces/IInventoryService.cs
diff options
context:
space:
mode:
authorMelanie2012-02-18 22:21:10 +0000
committerMelanie2012-02-18 22:21:10 +0000
commit985526b662f47404404281a3ef4a35afa607bfbf (patch)
treecbda3c3003b6f456498f0ee3ec6edfc10b5fd64a /OpenSim/Services/Interfaces/IInventoryService.cs
parentMerge branch 'master' into careminster (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-985526b662f47404404281a3ef4a35afa607bfbf.zip
opensim-SC-985526b662f47404404281a3ef4a35afa607bfbf.tar.gz
opensim-SC-985526b662f47404404281a3ef4a35afa607bfbf.tar.bz2
opensim-SC-985526b662f47404404281a3ef4a35afa607bfbf.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
Diffstat (limited to 'OpenSim/Services/Interfaces/IInventoryService.cs')
0 files changed, 0 insertions, 0 deletions