diff options
| author | Melanie | 2012-10-02 00:03:37 +0100 |
|---|---|---|
| committer | Melanie | 2012-10-02 00:03:37 +0100 |
| commit | 21c83d6238f7c2f464281c8747e89e88de4eeb5f (patch) | |
| tree | cfebb1e544f4a0aafc58314d29c2134649dfb623 /OpenSim/Framework/ForeignUserProfileData.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Allow setting connection limits, part 2 (diff) | |
| download | opensim-SC-21c83d6238f7c2f464281c8747e89e88de4eeb5f.zip opensim-SC-21c83d6238f7c2f464281c8747e89e88de4eeb5f.tar.gz opensim-SC-21c83d6238f7c2f464281c8747e89e88de4eeb5f.tar.bz2 opensim-SC-21c83d6238f7c2f464281c8747e89e88de4eeb5f.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
Diffstat (limited to 'OpenSim/Framework/ForeignUserProfileData.cs')
0 files changed, 0 insertions, 0 deletions