diff options
| author | Melanie | 2013-05-08 21:51:48 +0100 |
|---|---|---|
| committer | Melanie | 2013-05-08 21:51:48 +0100 |
| commit | cdaceea5a633683c713f084d9beb93a14061772f (patch) | |
| tree | 66798e45deff0d13e78740130dde68955a3ba86c /OpenSim/Region/RegionCombinerModule | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Guard the scene list when estates are updated (diff) | |
| download | opensim-SC-cdaceea5a633683c713f084d9beb93a14061772f.zip opensim-SC-cdaceea5a633683c713f084d9beb93a14061772f.tar.gz opensim-SC-cdaceea5a633683c713f084d9beb93a14061772f.tar.bz2 opensim-SC-cdaceea5a633683c713f084d9beb93a14061772f.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/IClientAPI.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
Diffstat (limited to 'OpenSim/Region/RegionCombinerModule')
0 files changed, 0 insertions, 0 deletions