diff options
| author | Melanie | 2012-10-28 18:58:43 +0000 |
|---|---|---|
| committer | Melanie | 2012-10-28 18:58:43 +0000 |
| commit | 5b0fc6029624cfe6dedd1096a2f9daa7fdc98470 (patch) | |
| tree | fd30d7dd76baaa38c277f143cafbfcca88ff3961 /OpenSim/Framework/Servers/Tests/OSHttpTests.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Add a property to determine if a link set is stored in the database. Also, fix (diff) | |
| download | opensim-SC-5b0fc6029624cfe6dedd1096a2f9daa7fdc98470.zip opensim-SC-5b0fc6029624cfe6dedd1096a2f9daa7fdc98470.tar.gz opensim-SC-5b0fc6029624cfe6dedd1096a2f9daa7fdc98470.tar.bz2 opensim-SC-5b0fc6029624cfe6dedd1096a2f9daa7fdc98470.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
Diffstat (limited to 'OpenSim/Framework/Servers/Tests/OSHttpTests.cs')
0 files changed, 0 insertions, 0 deletions