diff options
| author | Melanie | 2012-10-07 03:12:21 +0100 |
|---|---|---|
| committer | Melanie | 2012-10-07 03:12:21 +0100 |
| commit | 0c5b36a4f700e6944f743b33e8b8d2d5fe565f93 (patch) | |
| tree | 9fdc65657124754d43cfa749f7b5f6bae9ad4d2c /OpenSim/Framework/ClientInfo.cs | |
| parent | Fix merge issues (diff) | |
| parent | Fix threading in remote asset connector (diff) | |
| download | opensim-SC_OLD-0c5b36a4f700e6944f743b33e8b8d2d5fe565f93.zip opensim-SC_OLD-0c5b36a4f700e6944f743b33e8b8d2d5fe565f93.tar.gz opensim-SC_OLD-0c5b36a4f700e6944f743b33e8b8d2d5fe565f93.tar.bz2 opensim-SC_OLD-0c5b36a4f700e6944f743b33e8b8d2d5fe565f93.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
Diffstat (limited to 'OpenSim/Framework/ClientInfo.cs')
0 files changed, 0 insertions, 0 deletions