diff options
| author | Melanie | 2012-05-19 13:34:44 +0100 |
|---|---|---|
| committer | Melanie | 2012-05-19 13:34:44 +0100 |
| commit | ebd9d2618bc88eafdc0bbf86c9f1755476cc68e4 (patch) | |
| tree | 2d63da14ca345487a27f2202b2490eae0d86b60c /OpenSim/Framework/Console/ConsoleBase.cs | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | Remove recent IRegionCombinerModule.IsMegaregion(). In theory, there can be ... (diff) | |
| download | opensim-SC-ebd9d2618bc88eafdc0bbf86c9f1755476cc68e4.zip opensim-SC-ebd9d2618bc88eafdc0bbf86c9f1755476cc68e4.tar.gz opensim-SC-ebd9d2618bc88eafdc0bbf86c9f1755476cc68e4.tar.bz2 opensim-SC-ebd9d2618bc88eafdc0bbf86c9f1755476cc68e4.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
Diffstat (limited to 'OpenSim/Framework/Console/ConsoleBase.cs')
0 files changed, 0 insertions, 0 deletions