diff options
| author | Melanie | 2013-05-08 20:59:44 +0100 |
|---|---|---|
| committer | Melanie | 2013-05-08 20:59:44 +0100 |
| commit | bda45650674eba7d69bbc262ebc28f2c5c184623 (patch) | |
| tree | 43fae3ed56116a8d6c941f011fa8f358c1295442 /OpenSim/Services/AssetService | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Delete "" entry for AvatarPicker cap. (diff) | |
| download | opensim-SC_OLD-bda45650674eba7d69bbc262ebc28f2c5c184623.zip opensim-SC_OLD-bda45650674eba7d69bbc262ebc28f2c5c184623.tar.gz opensim-SC_OLD-bda45650674eba7d69bbc262ebc28f2c5c184623.tar.bz2 opensim-SC_OLD-bda45650674eba7d69bbc262ebc28f2c5c184623.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
Diffstat (limited to 'OpenSim/Services/AssetService')
0 files changed, 0 insertions, 0 deletions