diff options
| author | Jonathan Freedman | 2010-10-30 14:10:13 -0400 |
|---|---|---|
| committer | Jonathan Freedman | 2010-10-30 14:10:13 -0400 |
| commit | e371d3208cdda87f8ea86adb591ed6225f0aa442 (patch) | |
| tree | f481acfbafcb7134c00ff519c0c12b41e7815d02 /OpenSim/Services/Interfaces/IAssetService.cs | |
| parent | Merge branch 'master' into mantis5110 (diff) | |
| parent | Logins work now, but avatars are green ugly gnomes. (diff) | |
| download | opensim-SC-e371d3208cdda87f8ea86adb591ed6225f0aa442.zip opensim-SC-e371d3208cdda87f8ea86adb591ed6225f0aa442.tar.gz opensim-SC-e371d3208cdda87f8ea86adb591ed6225f0aa442.tar.bz2 opensim-SC-e371d3208cdda87f8ea86adb591ed6225f0aa442.tar.xz | |
Merge branch 'master' into mantis5110
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
Diffstat (limited to 'OpenSim/Services/Interfaces/IAssetService.cs')
0 files changed, 0 insertions, 0 deletions