diff options
| author | Melanie | 2012-03-18 20:44:56 +0000 |
|---|---|---|
| committer | Melanie | 2012-03-18 20:44:56 +0000 |
| commit | c7e302864a2eef7f9587ed22286c96a6074ac5b3 (patch) | |
| tree | 8f0df2f66811309fd790966770434fa3ff68bfdf /OpenSim/Services | |
| parent | Merge branch 'ubitwork' (diff) | |
| parent | Amend to previous commit: normalize strings ToLower. (diff) | |
| download | opensim-SC-c7e302864a2eef7f9587ed22286c96a6074ac5b3.zip opensim-SC-c7e302864a2eef7f9587ed22286c96a6074ac5b3.tar.gz opensim-SC-c7e302864a2eef7f9587ed22286c96a6074ac5b3.tar.bz2 opensim-SC-c7e302864a2eef7f9587ed22286c96a6074ac5b3.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Services')
0 files changed, 0 insertions, 0 deletions