diff options
| author | Melanie | 2012-02-19 20:08:01 +0100 |
|---|---|---|
| committer | Melanie | 2012-02-19 20:08:01 +0100 |
| commit | 96409cc2eeb4555609f72c8bc61fbdf4ac3e9933 (patch) | |
| tree | 394a7a07ff913c8efa390399c190d5c65bf8f95b /OpenSim/Services/Interfaces/IInventoryService.cs | |
| parent | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster (diff) | |
| parent | moved vehicle from SOG to SOP (diff) | |
| download | opensim-SC-96409cc2eeb4555609f72c8bc61fbdf4ac3e9933.zip opensim-SC-96409cc2eeb4555609f72c8bc61fbdf4ac3e9933.tar.gz opensim-SC-96409cc2eeb4555609f72c8bc61fbdf4ac3e9933.tar.bz2 opensim-SC-96409cc2eeb4555609f72c8bc61fbdf4ac3e9933.tar.xz | |
Merge branch 'ubitwork'
Conflicts:
OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
Diffstat (limited to 'OpenSim/Services/Interfaces/IInventoryService.cs')
0 files changed, 0 insertions, 0 deletions