diff options
| author | Melanie | 2012-01-06 00:08:18 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-06 00:08:18 +0000 |
| commit | fdfc4ab2a8e171139caf9751a23eb75afe881c2b (patch) | |
| tree | bc0d8d3066ecf5fe87e0778e23190d14a58d3bc1 /OpenSim/Region/RegionCombinerModule/RegionData.cs | |
| parent | That needs to be callable from elsewhere! (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-fdfc4ab2a8e171139caf9751a23eb75afe881c2b.zip opensim-SC-fdfc4ab2a8e171139caf9751a23eb75afe881c2b.tar.gz opensim-SC-fdfc4ab2a8e171139caf9751a23eb75afe881c2b.tar.bz2 opensim-SC-fdfc4ab2a8e171139caf9751a23eb75afe881c2b.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
Diffstat (limited to 'OpenSim/Region/RegionCombinerModule/RegionData.cs')
0 files changed, 0 insertions, 0 deletions