diff options
| author | Melanie | 2012-02-07 21:09:04 +0000 |
|---|---|---|
| committer | Melanie | 2012-02-07 21:09:04 +0000 |
| commit | 37049180f62d9b284c3ef1892cbf384774f6a2e3 (patch) | |
| tree | 6f4a73fdfed2c7750cae6f8691a74ef5a0a8745b /bin/HttpServer_OpenSim.xml | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Add TestAddTaskInventoryItem() (diff) | |
| download | opensim-SC-37049180f62d9b284c3ef1892cbf384774f6a2e3.zip opensim-SC-37049180f62d9b284c3ef1892cbf384774f6a2e3.tar.gz opensim-SC-37049180f62d9b284c3ef1892cbf384774f6a2e3.tar.bz2 opensim-SC-37049180f62d9b284c3ef1892cbf384774f6a2e3.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
Diffstat (limited to 'bin/HttpServer_OpenSim.xml')
0 files changed, 0 insertions, 0 deletions