aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Interfaces/IRegionConsole.cs
diff options
context:
space:
mode:
authorMelanie2013-05-11 02:35:26 +0100
committerMelanie2013-05-11 02:35:26 +0100
commit13cd8c17d781c517e083cdf9d5cc3b1b95802c2d (patch)
tree41e9d608cc0fbb486ae885d4c9e9a6ad85e39ff3 /OpenSim/Region/Framework/Interfaces/IRegionConsole.cs
parentMerge branch 'master' into careminster (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC-13cd8c17d781c517e083cdf9d5cc3b1b95802c2d.zip
opensim-SC-13cd8c17d781c517e083cdf9d5cc3b1b95802c2d.tar.gz
opensim-SC-13cd8c17d781c517e083cdf9d5cc3b1b95802c2d.tar.bz2
opensim-SC-13cd8c17d781c517e083cdf9d5cc3b1b95802c2d.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Services/LLLoginService/LLLoginResponse.cs OpenSim/Services/LLLoginService/LLLoginService.cs OpenSim/Tests/Common/Mock/TestClient.cs
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces/IRegionConsole.cs')
0 files changed, 0 insertions, 0 deletions