diff options
| author | Melanie | 2013-06-11 01:03:15 +0100 |
|---|---|---|
| committer | Melanie | 2013-06-11 01:03:15 +0100 |
| commit | a022ee576639c1bbceb5c4ba8de3cbd82e538bb3 (patch) | |
| tree | fb0d2ee165b7c87e814fc35c6551a26c2c6a488a /OpenSim/Capabilities/Handlers/AvatarPickerSearch | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Check For NaN and Infinity in llRot2Axis/Angle Fixes mantis #6669 (diff) | |
| download | opensim-SC-a022ee576639c1bbceb5c4ba8de3cbd82e538bb3.zip opensim-SC-a022ee576639c1bbceb5c4ba8de3cbd82e538bb3.tar.gz opensim-SC-a022ee576639c1bbceb5c4ba8de3cbd82e538bb3.tar.bz2 opensim-SC-a022ee576639c1bbceb5c4ba8de3cbd82e538bb3.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
Diffstat (limited to 'OpenSim/Capabilities/Handlers/AvatarPickerSearch')
0 files changed, 0 insertions, 0 deletions